aboutsummaryrefslogtreecommitdiffstats
path: root/subprojects
diff options
context:
space:
mode:
authorLibravatar Kristóf Marussy <kristof@marussy.com>2024-05-17 18:40:14 +0200
committerLibravatar Kristóf Marussy <kristof@marussy.com>2024-05-26 17:22:32 +0200
commit8faf73a84b51d94ee4d8cc49dbbf9ff82898f436 (patch)
tree5fe4657c90b0158ea843e0492486b0de5aa7ab3c /subprojects
parentfeat(language): rule validation (diff)
downloadrefinery-8faf73a84b51d94ee4d8cc49dbbf9ff82898f436.tar.gz
refinery-8faf73a84b51d94ee4d8cc49dbbf9ff82898f436.tar.zst
refinery-8faf73a84b51d94ee4d8cc49dbbf9ff82898f436.zip
refactor(language): merge Assertion and AssertionAction
Diffstat (limited to 'subprojects')
-rw-r--r--subprojects/language-model/problem.aird456
-rw-r--r--subprojects/language-model/src/main/resources/model/problem.ecore18
-rw-r--r--subprojects/language-model/src/main/resources/model/problem.genmodel18
-rw-r--r--subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ProblemTraceImpl.java2
-rw-r--r--subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/MetadataCreator.java2
-rw-r--r--subprojects/language/src/main/java/tools/refinery/language/formatting2/ProblemFormatter.java2
-rw-r--r--subprojects/language/src/main/java/tools/refinery/language/serializer/PreferShortAssertionsProblemSemanticSequencer.java12
-rw-r--r--subprojects/language/src/main/java/tools/refinery/language/typesystem/TypedModule.java25
-rw-r--r--subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java6
9 files changed, 334 insertions, 207 deletions
diff --git a/subprojects/language-model/problem.aird b/subprojects/language-model/problem.aird
index 61ccd75d..8682236b 100644
--- a/subprojects/language-model/problem.aird
+++ b/subprojects/language-model/problem.aird
@@ -7,7 +7,7 @@
7 <semanticResources>build/resources/main/model/problem.genmodel</semanticResources> 7 <semanticResources>build/resources/main/model/problem.genmodel</semanticResources>
8 <ownedViews xmi:type="viewpoint:DView" uid="_CsAAYKA4EeuqkpDnuik1sg"> 8 <ownedViews xmi:type="viewpoint:DView" uid="_CsAAYKA4EeuqkpDnuik1sg">
9 <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/> 9 <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
10 <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_CsYa4KA4EeuqkpDnuik1sg" name="declarations" repPath="#_CsUwgKA4EeuqkpDnuik1sg" changeId="1715895091128"> 10 <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_CsYa4KA4EeuqkpDnuik1sg" name="declarations" repPath="#_CsUwgKA4EeuqkpDnuik1sg" changeId="1715963399779">
11 <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> 11 <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
12 <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/> 12 <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/>
13 </ownedRepresentationDescriptors> 13 </ownedRepresentationDescriptors>
@@ -15,11 +15,11 @@
15 <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> 15 <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
16 <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/> 16 <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/>
17 </ownedRepresentationDescriptors> 17 </ownedRepresentationDescriptors>
18 <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_xj9yMF4eEe2rXNsIDUvqhw" name="assertions" repPath="#_xj6H0F4eEe2rXNsIDUvqhw" changeId="1715958425538"> 18 <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_xj9yMF4eEe2rXNsIDUvqhw" name="assertions" repPath="#_xj6H0F4eEe2rXNsIDUvqhw" changeId="1715963376752">
19 <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> 19 <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
20 <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/> 20 <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/>
21 </ownedRepresentationDescriptors> 21 </ownedRepresentationDescriptors>
22 <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_sCFokF4fEe2rXNsIDUvqhw" name="actions" repPath="#_sCFBgF4fEe2rXNsIDUvqhw" changeId="1715954805155"> 22 <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_sCFokF4fEe2rXNsIDUvqhw" name="actions" repPath="#_sCFBgF4fEe2rXNsIDUvqhw" changeId="1715963438471">
23 <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> 23 <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
24 <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/> 24 <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/>
25 </ownedRepresentationDescriptors> 25 </ownedRepresentationDescriptors>
@@ -2140,9 +2140,9 @@
2140 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> 2140 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
2141 <arrangeConstraints>KEEP_SIZE</arrangeConstraints> 2141 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
2142 <arrangeConstraints>KEEP_RATIO</arrangeConstraints> 2142 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
2143 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_swnaiirZEeyyC-O0_LlY9w" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228"> 2143 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_tGkYexRqEe-4k7CzzL6IsA" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
2144 <labelFormat>italic</labelFormat> 2144 <labelFormat>italic</labelFormat>
2145 <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']/@conditionnalStyles.1/@style"/> 2145 <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']/@conditionnalStyles.0/@style"/>
2146 </ownedStyle> 2146 </ownedStyle>
2147 <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']"/> 2147 <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']"/>
2148 </ownedDiagramElements> 2148 </ownedDiagramElements>
@@ -5201,20 +5201,16 @@
5201 <styles xmi:type="notation:FilteringStyle" xmi:id="_yj6zVl4eEe2rXNsIDUvqhw"/> 5201 <styles xmi:type="notation:FilteringStyle" xmi:id="_yj6zVl4eEe2rXNsIDUvqhw"/>
5202 </children> 5202 </children>
5203 <styles xmi:type="notation:ShapeStyle" xmi:id="_yj6zUV4eEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8" italic="true"/> 5203 <styles xmi:type="notation:ShapeStyle" xmi:id="_yj6zUV4eEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8" italic="true"/>
5204 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yj6zUl4eEe2rXNsIDUvqhw" x="357" y="24"/> 5204 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yj6zUl4eEe2rXNsIDUvqhw" x="786" y="48"/>
5205 </children> 5205 </children>
5206 <children xmi:type="notation:Node" xmi:id="_z9rbk14eEe2rXNsIDUvqhw" type="2003" element="_z9nxMF4eEe2rXNsIDUvqhw"> 5206 <children xmi:type="notation:Node" xmi:id="_z9rbk14eEe2rXNsIDUvqhw" type="2003" element="_z9nxMF4eEe2rXNsIDUvqhw">
5207 <children xmi:type="notation:Node" xmi:id="_z9rbll4eEe2rXNsIDUvqhw" type="5007"/> 5207 <children xmi:type="notation:Node" xmi:id="_z9rbll4eEe2rXNsIDUvqhw" type="5007"/>
5208 <children xmi:type="notation:Node" xmi:id="_z9rbl14eEe2rXNsIDUvqhw" type="7004"> 5208 <children xmi:type="notation:Node" xmi:id="_z9rbl14eEe2rXNsIDUvqhw" type="7004">
5209 <children xmi:type="notation:Node" xmi:id="_z9sCql4eEe2rXNsIDUvqhw" type="3010" element="_z9qNcF4eEe2rXNsIDUvqhw">
5210 <styles xmi:type="notation:FontStyle" xmi:id="_z9sCq14eEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/>
5211 <layoutConstraint xmi:type="notation:Location" xmi:id="_z9sCrF4eEe2rXNsIDUvqhw"/>
5212 </children>
5213 <styles xmi:type="notation:SortingStyle" xmi:id="_z9rbmF4eEe2rXNsIDUvqhw"/> 5209 <styles xmi:type="notation:SortingStyle" xmi:id="_z9rbmF4eEe2rXNsIDUvqhw"/>
5214 <styles xmi:type="notation:FilteringStyle" xmi:id="_z9rbmV4eEe2rXNsIDUvqhw"/> 5210 <styles xmi:type="notation:FilteringStyle" xmi:id="_z9rbmV4eEe2rXNsIDUvqhw"/>
5215 </children> 5211 </children>
5216 <styles xmi:type="notation:ShapeStyle" xmi:id="_z9rblF4eEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> 5212 <styles xmi:type="notation:ShapeStyle" xmi:id="_z9rblF4eEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/>
5217 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z9rblV4eEe2rXNsIDUvqhw" x="336" y="180"/> 5213 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z9rblV4eEe2rXNsIDUvqhw" x="328" y="48"/>
5218 </children> 5214 </children>
5219 <children xmi:type="notation:Node" xmi:id="_z9sCoF4eEe2rXNsIDUvqhw" type="2003" element="_z9oYQF4eEe2rXNsIDUvqhw"> 5215 <children xmi:type="notation:Node" xmi:id="_z9sCoF4eEe2rXNsIDUvqhw" type="2003" element="_z9oYQF4eEe2rXNsIDUvqhw">
5220 <children xmi:type="notation:Node" xmi:id="_z9sCo14eEe2rXNsIDUvqhw" type="5007"/> 5216 <children xmi:type="notation:Node" xmi:id="_z9sCo14eEe2rXNsIDUvqhw" type="5007"/>
@@ -5223,7 +5219,7 @@
5223 <styles xmi:type="notation:FilteringStyle" xmi:id="_z9sCpl4eEe2rXNsIDUvqhw"/> 5219 <styles xmi:type="notation:FilteringStyle" xmi:id="_z9sCpl4eEe2rXNsIDUvqhw"/>
5224 </children> 5220 </children>
5225 <styles xmi:type="notation:ShapeStyle" xmi:id="_z9sCoV4eEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8" italic="true"/> 5221 <styles xmi:type="notation:ShapeStyle" xmi:id="_z9sCoV4eEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8" italic="true"/>
5226 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z9sCol4eEe2rXNsIDUvqhw" x="166" y="356"/> 5222 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z9sCol4eEe2rXNsIDUvqhw" x="158" y="224"/>
5227 </children> 5223 </children>
5228 <children xmi:type="notation:Node" xmi:id="_A-j38F4fEe2rXNsIDUvqhw" visible="false" type="2003" element="_A-fmgF4fEe2rXNsIDUvqhw"> 5224 <children xmi:type="notation:Node" xmi:id="_A-j38F4fEe2rXNsIDUvqhw" visible="false" type="2003" element="_A-fmgF4fEe2rXNsIDUvqhw">
5229 <children xmi:type="notation:Node" xmi:id="_A-j3814fEe2rXNsIDUvqhw" type="5007"/> 5225 <children xmi:type="notation:Node" xmi:id="_A-j3814fEe2rXNsIDUvqhw" type="5007"/>
@@ -5241,7 +5237,7 @@
5241 <styles xmi:type="notation:FilteringStyle" xmi:id="_ChaKzV4fEe2rXNsIDUvqhw"/> 5237 <styles xmi:type="notation:FilteringStyle" xmi:id="_ChaKzV4fEe2rXNsIDUvqhw"/>
5242 </children> 5238 </children>
5243 <styles xmi:type="notation:ShapeStyle" xmi:id="_ChaKyF4fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> 5239 <styles xmi:type="notation:ShapeStyle" xmi:id="_ChaKyF4fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/>
5244 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ChaKyV4fEe2rXNsIDUvqhw" x="240" y="516" width="159"/> 5240 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ChaKyV4fEe2rXNsIDUvqhw" x="232" y="384" width="159"/>
5245 </children> 5241 </children>
5246 <children xmi:type="notation:Node" xmi:id="_ChaKzl4fEe2rXNsIDUvqhw" type="2003" element="_ChVSQF4fEe2rXNsIDUvqhw"> 5242 <children xmi:type="notation:Node" xmi:id="_ChaKzl4fEe2rXNsIDUvqhw" type="2003" element="_ChVSQF4fEe2rXNsIDUvqhw">
5247 <children xmi:type="notation:Node" xmi:id="_Chax0F4fEe2rXNsIDUvqhw" type="5007"/> 5243 <children xmi:type="notation:Node" xmi:id="_Chax0F4fEe2rXNsIDUvqhw" type="5007"/>
@@ -5250,7 +5246,7 @@
5250 <styles xmi:type="notation:FilteringStyle" xmi:id="_Chax014fEe2rXNsIDUvqhw"/> 5246 <styles xmi:type="notation:FilteringStyle" xmi:id="_Chax014fEe2rXNsIDUvqhw"/>
5251 </children> 5247 </children>
5252 <styles xmi:type="notation:ShapeStyle" xmi:id="_ChaKz14fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> 5248 <styles xmi:type="notation:ShapeStyle" xmi:id="_ChaKz14fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/>
5253 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ChaK0F4fEe2rXNsIDUvqhw" x="20" y="516"/> 5249 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ChaK0F4fEe2rXNsIDUvqhw" x="27" y="384"/>
5254 </children> 5250 </children>
5255 <children xmi:type="notation:Node" xmi:id="_85Kp8GTvEe2qdtyPWAtoxA" type="2003" element="_85G_kGTvEe2qdtyPWAtoxA"> 5251 <children xmi:type="notation:Node" xmi:id="_85Kp8GTvEe2qdtyPWAtoxA" type="2003" element="_85G_kGTvEe2qdtyPWAtoxA">
5256 <children xmi:type="notation:Node" xmi:id="_85Kp82TvEe2qdtyPWAtoxA" type="5007"/> 5252 <children xmi:type="notation:Node" xmi:id="_85Kp82TvEe2qdtyPWAtoxA" type="5007"/>
@@ -5259,7 +5255,7 @@
5259 <styles xmi:type="notation:FilteringStyle" xmi:id="_85Kp9mTvEe2qdtyPWAtoxA"/> 5255 <styles xmi:type="notation:FilteringStyle" xmi:id="_85Kp9mTvEe2qdtyPWAtoxA"/>
5260 </children> 5256 </children>
5261 <styles xmi:type="notation:ShapeStyle" xmi:id="_85Kp8WTvEe2qdtyPWAtoxA" fontName="Noto Sans" fontHeight="8" italic="true"/> 5257 <styles xmi:type="notation:ShapeStyle" xmi:id="_85Kp8WTvEe2qdtyPWAtoxA" fontName="Noto Sans" fontHeight="8" italic="true"/>
5262 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_85Kp8mTvEe2qdtyPWAtoxA" x="44" y="180"/> 5258 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_85Kp8mTvEe2qdtyPWAtoxA" x="36" y="48"/>
5263 </children> 5259 </children>
5264 <children xmi:type="notation:Node" xmi:id="_IhNHMGgpEe24RpwpWgpkFQ" type="2003" element="_IhJc0GgpEe24RpwpWgpkFQ"> 5260 <children xmi:type="notation:Node" xmi:id="_IhNHMGgpEe24RpwpWgpkFQ" type="2003" element="_IhJc0GgpEe24RpwpWgpkFQ">
5265 <children xmi:type="notation:Node" xmi:id="_IhNHM2gpEe24RpwpWgpkFQ" type="5007"/> 5261 <children xmi:type="notation:Node" xmi:id="_IhNHM2gpEe24RpwpWgpkFQ" type="5007"/>
@@ -5268,7 +5264,7 @@
5268 <styles xmi:type="notation:FilteringStyle" xmi:id="_IhNHNmgpEe24RpwpWgpkFQ"/> 5264 <styles xmi:type="notation:FilteringStyle" xmi:id="_IhNHNmgpEe24RpwpWgpkFQ"/>
5269 </children> 5265 </children>
5270 <styles xmi:type="notation:ShapeStyle" xmi:id="_IhNHMWgpEe24RpwpWgpkFQ" fontName="Noto Sans" fontHeight="8" italic="true"/> 5266 <styles xmi:type="notation:ShapeStyle" xmi:id="_IhNHMWgpEe24RpwpWgpkFQ" fontName="Noto Sans" fontHeight="8" italic="true"/>
5271 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IhNHMmgpEe24RpwpWgpkFQ" x="636" y="356"/> 5267 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IhNHMmgpEe24RpwpWgpkFQ" x="459" y="224"/>
5272 </children> 5268 </children>
5273 <children xmi:type="notation:Node" xmi:id="_dZ_BIBReEe-4k7CzzL6IsA" type="2003" element="_dZ46gBReEe-4k7CzzL6IsA"> 5269 <children xmi:type="notation:Node" xmi:id="_dZ_BIBReEe-4k7CzzL6IsA" type="2003" element="_dZ46gBReEe-4k7CzzL6IsA">
5274 <children xmi:type="notation:Node" xmi:id="_dZ_BIxReEe-4k7CzzL6IsA" type="5007"/> 5270 <children xmi:type="notation:Node" xmi:id="_dZ_BIxReEe-4k7CzzL6IsA" type="5007"/>
@@ -5277,7 +5273,20 @@
5277 <styles xmi:type="notation:FilteringStyle" xmi:id="_dZ_BJhReEe-4k7CzzL6IsA"/> 5273 <styles xmi:type="notation:FilteringStyle" xmi:id="_dZ_BJhReEe-4k7CzzL6IsA"/>
5278 </children> 5274 </children>
5279 <styles xmi:type="notation:ShapeStyle" xmi:id="_dZ_BIRReEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8" italic="true"/> 5275 <styles xmi:type="notation:ShapeStyle" xmi:id="_dZ_BIRReEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8" italic="true"/>
5280 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZ_BIhReEe-4k7CzzL6IsA" x="260" y="708"/> 5276 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZ_BIhReEe-4k7CzzL6IsA" x="252" y="576"/>
5277 </children>
5278 <children xmi:type="notation:Node" xmi:id="_W77iOBRqEe-4k7CzzL6IsA" type="2003" element="_W7ZWoBRqEe-4k7CzzL6IsA">
5279 <children xmi:type="notation:Node" xmi:id="_W77iOxRqEe-4k7CzzL6IsA" type="5007"/>
5280 <children xmi:type="notation:Node" xmi:id="_W77iPBRqEe-4k7CzzL6IsA" type="7004">
5281 <children xmi:type="notation:Node" xmi:id="_bZwYUBRqEe-4k7CzzL6IsA" type="3010" element="_bZWIoBRqEe-4k7CzzL6IsA">
5282 <styles xmi:type="notation:FontStyle" xmi:id="_bZwYURRqEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/>
5283 <layoutConstraint xmi:type="notation:Location" xmi:id="_bZwYUhRqEe-4k7CzzL6IsA"/>
5284 </children>
5285 <styles xmi:type="notation:SortingStyle" xmi:id="_W77iPRRqEe-4k7CzzL6IsA"/>
5286 <styles xmi:type="notation:FilteringStyle" xmi:id="_W77iPhRqEe-4k7CzzL6IsA"/>
5287 </children>
5288 <styles xmi:type="notation:ShapeStyle" xmi:id="_W77iORRqEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/>
5289 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W77iOhRqEe-4k7CzzL6IsA" x="786" y="432" width="120" height="100"/>
5281 </children> 5290 </children>
5282 <styles xmi:type="notation:DiagramStyle" xmi:id="_xkD40l4eEe2rXNsIDUvqhw"/> 5291 <styles xmi:type="notation:DiagramStyle" xmi:id="_xkD40l4eEe2rXNsIDUvqhw"/>
5283 <edges xmi:type="notation:Edge" xmi:id="_z9sps14eEe2rXNsIDUvqhw" type="4001" element="_z9q0gF4eEe2rXNsIDUvqhw" source="_z9rbk14eEe2rXNsIDUvqhw" target="_z9sCoF4eEe2rXNsIDUvqhw"> 5292 <edges xmi:type="notation:Edge" xmi:id="_z9sps14eEe2rXNsIDUvqhw" type="4001" element="_z9q0gF4eEe2rXNsIDUvqhw" source="_z9rbk14eEe2rXNsIDUvqhw" target="_z9sCoF4eEe2rXNsIDUvqhw">
@@ -5296,22 +5305,6 @@
5296 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z9spvV4eEe2rXNsIDUvqhw" id="(0.5,0.5)"/> 5305 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z9spvV4eEe2rXNsIDUvqhw" id="(0.5,0.5)"/>
5297 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z9spvl4eEe2rXNsIDUvqhw" id="(0.5,0.5)"/> 5306 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z9spvl4eEe2rXNsIDUvqhw" id="(0.5,0.5)"/>
5298 </edges> 5307 </edges>
5299 <edges xmi:type="notation:Edge" xmi:id="_z9spv14eEe2rXNsIDUvqhw" type="4001" element="_z9q0il4eEe2rXNsIDUvqhw" source="_z9rbk14eEe2rXNsIDUvqhw" target="_yj6zUF4eEe2rXNsIDUvqhw">
5300 <children xmi:type="notation:Node" xmi:id="_z9spw14eEe2rXNsIDUvqhw" type="6001">
5301 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z9spxF4eEe2rXNsIDUvqhw" y="-10"/>
5302 </children>
5303 <children xmi:type="notation:Node" xmi:id="_z9tQwF4eEe2rXNsIDUvqhw" type="6002">
5304 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z9tQwV4eEe2rXNsIDUvqhw" y="10"/>
5305 </children>
5306 <children xmi:type="notation:Node" xmi:id="_z9tQwl4eEe2rXNsIDUvqhw" type="6003">
5307 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z9tQw14eEe2rXNsIDUvqhw" y="10"/>
5308 </children>
5309 <styles xmi:type="notation:ConnectorStyle" xmi:id="_z9spwF4eEe2rXNsIDUvqhw" routing="Tree"/>
5310 <styles xmi:type="notation:FontStyle" xmi:id="_z9spwV4eEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/>
5311 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_z9spwl4eEe2rXNsIDUvqhw" points="[0, 0, -71, 555]$[71, -555, 0, 0]"/>
5312 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z9tQxF4eEe2rXNsIDUvqhw" id="(0.3522012578616352,0.05102040816326531)"/>
5313 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z9tQxV4eEe2rXNsIDUvqhw" id="(0.5,0.5)"/>
5314 </edges>
5315 <edges xmi:type="notation:Edge" xmi:id="_ChcnBF4fEe2rXNsIDUvqhw" type="4001" element="_ChY8uV4fEe2rXNsIDUvqhw" source="_ChaKx14fEe2rXNsIDUvqhw" target="_z9sCoF4eEe2rXNsIDUvqhw"> 5308 <edges xmi:type="notation:Edge" xmi:id="_ChcnBF4fEe2rXNsIDUvqhw" type="4001" element="_ChY8uV4fEe2rXNsIDUvqhw" source="_ChaKx14fEe2rXNsIDUvqhw" target="_z9sCoF4eEe2rXNsIDUvqhw">
5316 <children xmi:type="notation:Node" xmi:id="_ChcnCF4fEe2rXNsIDUvqhw" type="6001"> 5309 <children xmi:type="notation:Node" xmi:id="_ChcnCF4fEe2rXNsIDUvqhw" type="6001">
5317 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ChcnCV4fEe2rXNsIDUvqhw" y="-10"/> 5310 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ChcnCV4fEe2rXNsIDUvqhw" y="-10"/>
@@ -5362,17 +5355,17 @@
5362 </edges> 5355 </edges>
5363 <edges xmi:type="notation:Edge" xmi:id="_jkascGkGEe24rIYSlCjKHA" type="4001" element="_CxoVTGgpEe24RpwpWgpkFQ" source="_z9rbk14eEe2rXNsIDUvqhw" target="_IhNHMGgpEe24RpwpWgpkFQ"> 5356 <edges xmi:type="notation:Edge" xmi:id="_jkascGkGEe24rIYSlCjKHA" type="4001" element="_CxoVTGgpEe24RpwpWgpkFQ" source="_z9rbk14eEe2rXNsIDUvqhw" target="_IhNHMGgpEe24RpwpWgpkFQ">
5364 <children xmi:type="notation:Node" xmi:id="_jkbTg2kGEe24rIYSlCjKHA" type="6001"> 5357 <children xmi:type="notation:Node" xmi:id="_jkbTg2kGEe24rIYSlCjKHA" type="6001">
5365 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jkbThGkGEe24rIYSlCjKHA" x="-72" y="-16"/> 5358 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jkbThGkGEe24rIYSlCjKHA" x="22" y="-16"/>
5366 </children> 5359 </children>
5367 <children xmi:type="notation:Node" xmi:id="_jkbThWkGEe24rIYSlCjKHA" type="6002"> 5360 <children xmi:type="notation:Node" xmi:id="_jkbThWkGEe24rIYSlCjKHA" type="6002">
5368 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jkbThmkGEe24rIYSlCjKHA" x="52" y="10"/> 5361 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jkbThmkGEe24rIYSlCjKHA" x="30" y="-73"/>
5369 </children> 5362 </children>
5370 <children xmi:type="notation:Node" xmi:id="_jkbTh2kGEe24rIYSlCjKHA" type="6003"> 5363 <children xmi:type="notation:Node" xmi:id="_jkbTh2kGEe24rIYSlCjKHA" type="6003">
5371 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jkbTiGkGEe24rIYSlCjKHA" x="6" y="23"/> 5364 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jkbTiGkGEe24rIYSlCjKHA" x="18" y="11"/>
5372 </children> 5365 </children>
5373 <styles xmi:type="notation:ConnectorStyle" xmi:id="_jkbTgGkGEe24rIYSlCjKHA" routing="Rectilinear"/> 5366 <styles xmi:type="notation:ConnectorStyle" xmi:id="_jkbTgGkGEe24rIYSlCjKHA" routing="Rectilinear"/>
5374 <styles xmi:type="notation:FontStyle" xmi:id="_jkbTgWkGEe24rIYSlCjKHA" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> 5367 <styles xmi:type="notation:FontStyle" xmi:id="_jkbTgWkGEe24rIYSlCjKHA" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
5375 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jkbTgmkGEe24rIYSlCjKHA" points="[13, 0, -225, -91]$[13, 46, -225, -45]$[251, 46, 13, -45]$[251, 78, 13, -13]"/> 5368 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jkbTgmkGEe24rIYSlCjKHA" points="[3, 0, -93, -91]$[3, 46, -93, -45]$[100, 46, 4, -45]$[100, 78, 4, -13]"/>
5376 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jkchoGkGEe24rIYSlCjKHA" id="(0.6792452830188679,1.0)"/> 5369 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jkchoGkGEe24rIYSlCjKHA" id="(0.6792452830188679,1.0)"/>
5377 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jkchoWkGEe24rIYSlCjKHA" id="(0.3813559322033898,0.1326530612244898)"/> 5370 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jkchoWkGEe24rIYSlCjKHA" id="(0.3813559322033898,0.1326530612244898)"/>
5378 </edges> 5371 </edges>
@@ -5406,6 +5399,39 @@
5406 <styles xmi:type="notation:FontStyle" xmi:id="_eIo27hReEe-4k7CzzL6IsA" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> 5399 <styles xmi:type="notation:FontStyle" xmi:id="_eIo27hReEe-4k7CzzL6IsA" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
5407 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eIo27xReEe-4k7CzzL6IsA" points="[6, 49, 0, -143]$[6, 143, 0, -49]"/> 5400 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eIo27xReEe-4k7CzzL6IsA" points="[6, 49, 0, -143]$[6, 143, 0, -49]"/>
5408 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eIpd9BReEe-4k7CzzL6IsA" id="(0.4681528662420382,0.5)"/> 5401 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eIpd9BReEe-4k7CzzL6IsA" id="(0.4681528662420382,0.5)"/>
5402 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YahnEBRqEe-4k7CzzL6IsA" id="(0.5,0.5)"/>
5403 </edges>
5404 <edges xmi:type="notation:Edge" xmi:id="_aTR4cBRqEe-4k7CzzL6IsA" type="4001" element="_z9q0il4eEe2rXNsIDUvqhw" source="_W77iOBRqEe-4k7CzzL6IsA" target="_yj6zUF4eEe2rXNsIDUvqhw">
5405 <children xmi:type="notation:Node" xmi:id="_aTR4dBRqEe-4k7CzzL6IsA" type="6001">
5406 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aTR4dRRqEe-4k7CzzL6IsA" x="-109" y="-38"/>
5407 </children>
5408 <children xmi:type="notation:Node" xmi:id="_aTR4dhRqEe-4k7CzzL6IsA" type="6002">
5409 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aTR4dxRqEe-4k7CzzL6IsA" x="-1" y="10"/>
5410 </children>
5411 <children xmi:type="notation:Node" xmi:id="_aTR4eBRqEe-4k7CzzL6IsA" type="6003">
5412 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aTR4eRRqEe-4k7CzzL6IsA" x="-69" y="19"/>
5413 </children>
5414 <styles xmi:type="notation:ConnectorStyle" xmi:id="_aTR4cRRqEe-4k7CzzL6IsA" routing="Tree"/>
5415 <styles xmi:type="notation:FontStyle" xmi:id="_aTR4chRqEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/>
5416 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aTR4cxRqEe-4k7CzzL6IsA" points="[0, -5, 36, 335]$[0, -185, 36, 155]$[-37, -185, -1, 155]$[-37, -291, -1, 49]"/>
5417 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aTSfgBRqEe-4k7CzzL6IsA" id="(0.8050847457627118,0.05102040816326531)"/>
5418 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aTSfgRRqEe-4k7CzzL6IsA" id="(0.5,0.5)"/>
5419 </edges>
5420 <edges xmi:type="notation:Edge" xmi:id="_kJDqwBRqEe-4k7CzzL6IsA" type="4001" element="_kInl-BRqEe-4k7CzzL6IsA" source="_W77iOBRqEe-4k7CzzL6IsA" target="_z9rbk14eEe2rXNsIDUvqhw">
5421 <children xmi:type="notation:Node" xmi:id="_kJDqxBRqEe-4k7CzzL6IsA" type="6001">
5422 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kJDqxRRqEe-4k7CzzL6IsA" x="-184" y="-10"/>
5423 </children>
5424 <children xmi:type="notation:Node" xmi:id="_kJDqxhRqEe-4k7CzzL6IsA" type="6002">
5425 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kJDqxxRqEe-4k7CzzL6IsA" x="-38" y="-48"/>
5426 </children>
5427 <children xmi:type="notation:Node" xmi:id="_kJDqyBRqEe-4k7CzzL6IsA" type="6003">
5428 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kJDqyRRqEe-4k7CzzL6IsA" x="-79" y="95"/>
5429 </children>
5430 <styles xmi:type="notation:ConnectorStyle" xmi:id="_kJDqwRRqEe-4k7CzzL6IsA" routing="Tree"/>
5431 <styles xmi:type="notation:FontStyle" xmi:id="_kJDqwhRqEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/>
5432 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kJDqwxRqEe-4k7CzzL6IsA" points="[0, -24, 466, 335]$[0, -108, 466, 251]$[-465, -108, 1, 251]$[-465, -310, 1, 49]"/>
5433 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kJER0BRqEe-4k7CzzL6IsA" id="(0.22033898305084745,0.061224489795918366)"/>
5434 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kJER0RRqEe-4k7CzzL6IsA" id="(0.5,0.5)"/>
5409 </edges> 5435 </edges>
5410 </data> 5436 </data>
5411 </ownedAnnotationEntries> 5437 </ownedAnnotationEntries>
@@ -5434,24 +5460,17 @@
5434 </ownedStyle> 5460 </ownedStyle>
5435 <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']"/> 5461 <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']"/>
5436 </ownedDiagramElements> 5462 </ownedDiagramElements>
5437 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_z9nxMF4eEe2rXNsIDUvqhw" name="Assertion" tooltipText="" outgoingEdges="_z9q0gF4eEe2rXNsIDUvqhw _z9q0il4eEe2rXNsIDUvqhw _AUF41GTwEe2qdtyPWAtoxA _CxoVTGgpEe24RpwpWgpkFQ" width="12" height="10"> 5463 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_z9nxMF4eEe2rXNsIDUvqhw" name="AbstractAssertion" tooltipText="" outgoingEdges="_z9q0gF4eEe2rXNsIDUvqhw _AUF41GTwEe2qdtyPWAtoxA _CxoVTGgpEe24RpwpWgpkFQ" incomingEdges="_kInl-BRqEe-4k7CzzL6IsA" width="12" height="10">
5438 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Assertion"/> 5464 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AbstractAssertion"/>
5439 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Assertion"/> 5465 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AbstractAssertion"/>
5440 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> 5466 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
5441 <arrangeConstraints>KEEP_SIZE</arrangeConstraints> 5467 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
5442 <arrangeConstraints>KEEP_RATIO</arrangeConstraints> 5468 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
5443 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_F1pf42gpEe24RpwpWgpkFQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> 5469 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_hH94XxRqEe-4k7CzzL6IsA" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
5444 <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"/> 5470 <labelFormat>italic</labelFormat>
5471 <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']/@conditionnalStyles.1/@style"/>
5445 </ownedStyle> 5472 </ownedStyle>
5446 <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']"/> 5473 <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']"/>
5447 <ownedElements xmi:type="diagram:DNodeListElement" uid="_z9qNcF4eEe2rXNsIDUvqhw" name="default : EBoolean = false" tooltipText="">
5448 <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Assertion/default"/>
5449 <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Assertion/default"/>
5450 <ownedStyle xmi:type="diagram:BundledImage" uid="_z9qNcV4eEe2rXNsIDUvqhw" labelAlignment="LEFT">
5451 <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"/>
5452 </ownedStyle>
5453 <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']"/>
5454 </ownedElements>
5455 </ownedDiagramElements> 5474 </ownedDiagramElements>
5456 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_z9oYQF4eEe2rXNsIDUvqhw" name="AssertionArgument" tooltipText="" incomingEdges="_z9q0gF4eEe2rXNsIDUvqhw _ChY8uV4fEe2rXNsIDUvqhw _ChZjtl4fEe2rXNsIDUvqhw" width="12" height="10"> 5475 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_z9oYQF4eEe2rXNsIDUvqhw" name="AssertionArgument" tooltipText="" incomingEdges="_z9q0gF4eEe2rXNsIDUvqhw _ChY8uV4fEe2rXNsIDUvqhw _ChZjtl4fEe2rXNsIDUvqhw" width="12" height="10">
5457 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionArgument"/> 5476 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionArgument"/>
@@ -5466,8 +5485,8 @@
5466 <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']"/> 5485 <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']"/>
5467 </ownedDiagramElements> 5486 </ownedDiagramElements>
5468 <ownedDiagramElements xmi:type="diagram:DEdge" uid="_z9q0gF4eEe2rXNsIDUvqhw" name="[0..*] arguments" sourceNode="_z9nxMF4eEe2rXNsIDUvqhw" targetNode="_z9oYQF4eEe2rXNsIDUvqhw"> 5487 <ownedDiagramElements xmi:type="diagram:DEdge" uid="_z9q0gF4eEe2rXNsIDUvqhw" name="[0..*] arguments" sourceNode="_z9nxMF4eEe2rXNsIDUvqhw" targetNode="_z9oYQF4eEe2rXNsIDUvqhw">
5469 <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Assertion/arguments"/> 5488 <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AbstractAssertion/arguments"/>
5470 <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Assertion/arguments"/> 5489 <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AbstractAssertion/arguments"/>
5471 <ownedStyle xmi:type="diagram:EdgeStyle" uid="_z9q0hF4eEe2rXNsIDUvqhw" description="_z9q0gV4eEe2rXNsIDUvqhw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0"> 5490 <ownedStyle xmi:type="diagram:EdgeStyle" uid="_z9q0hF4eEe2rXNsIDUvqhw" description="_z9q0gV4eEe2rXNsIDUvqhw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
5472 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_z9q0hl4eEe2rXNsIDUvqhw" showIcon="false"> 5491 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_z9q0hl4eEe2rXNsIDUvqhw" showIcon="false">
5473 <customFeatures>labelSize</customFeatures> 5492 <customFeatures>labelSize</customFeatures>
@@ -5478,7 +5497,7 @@
5478 </ownedStyle> 5497 </ownedStyle>
5479 <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']"/> 5498 <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']"/>
5480 </ownedDiagramElements> 5499 </ownedDiagramElements>
5481 <ownedDiagramElements xmi:type="diagram:DEdge" uid="_z9q0il4eEe2rXNsIDUvqhw" sourceNode="_z9nxMF4eEe2rXNsIDUvqhw" targetNode="_yj4-IF4eEe2rXNsIDUvqhw"> 5500 <ownedDiagramElements xmi:type="diagram:DEdge" uid="_z9q0il4eEe2rXNsIDUvqhw" sourceNode="_W7ZWoBRqEe-4k7CzzL6IsA" targetNode="_yj4-IF4eEe2rXNsIDUvqhw">
5482 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Assertion"/> 5501 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Assertion"/>
5483 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Assertion"/> 5502 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Assertion"/>
5484 <ownedStyle xmi:type="diagram:EdgeStyle" uid="_F1rVImgpEe24RpwpWgpkFQ" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree"> 5503 <ownedStyle xmi:type="diagram:EdgeStyle" uid="_F1rVImgpEe24RpwpWgpkFQ" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
@@ -5575,8 +5594,8 @@
5575 <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']"/> 5594 <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']"/>
5576 </ownedDiagramElements> 5595 </ownedDiagramElements>
5577 <ownedDiagramElements xmi:type="diagram:DEdge" uid="_AUF41GTwEe2qdtyPWAtoxA" name="[0..1] relation" sourceNode="_z9nxMF4eEe2rXNsIDUvqhw" targetNode="_85G_kGTvEe2qdtyPWAtoxA"> 5596 <ownedDiagramElements xmi:type="diagram:DEdge" uid="_AUF41GTwEe2qdtyPWAtoxA" name="[0..1] relation" sourceNode="_z9nxMF4eEe2rXNsIDUvqhw" targetNode="_85G_kGTvEe2qdtyPWAtoxA">
5578 <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Assertion/relation"/> 5597 <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AbstractAssertion/relation"/>
5579 <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Assertion/relation"/> 5598 <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AbstractAssertion/relation"/>
5580 <ownedStyle xmi:type="diagram:EdgeStyle" uid="_AUGfwGTwEe2qdtyPWAtoxA" routingStyle="manhattan" strokeColor="0,0,0"> 5599 <ownedStyle xmi:type="diagram:EdgeStyle" uid="_AUGfwGTwEe2qdtyPWAtoxA" routingStyle="manhattan" strokeColor="0,0,0">
5581 <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"/> 5600 <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"/>
5582 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_AUGfwmTwEe2qdtyPWAtoxA" showIcon="false"> 5601 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_AUGfwmTwEe2qdtyPWAtoxA" showIcon="false">
@@ -5589,8 +5608,8 @@
5589 <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']"/> 5608 <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']"/>
5590 </ownedDiagramElements> 5609 </ownedDiagramElements>
5591 <ownedDiagramElements xmi:type="diagram:DEdge" uid="_CxoVTGgpEe24RpwpWgpkFQ" name="[0..1] value" sourceNode="_z9nxMF4eEe2rXNsIDUvqhw" targetNode="_IhJc0GgpEe24RpwpWgpkFQ"> 5610 <ownedDiagramElements xmi:type="diagram:DEdge" uid="_CxoVTGgpEe24RpwpWgpkFQ" name="[0..1] value" sourceNode="_z9nxMF4eEe2rXNsIDUvqhw" targetNode="_IhJc0GgpEe24RpwpWgpkFQ">
5592 <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Assertion/value"/> 5611 <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AbstractAssertion/value"/>
5593 <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Assertion/value"/> 5612 <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AbstractAssertion/value"/>
5594 <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Gl7GTGgpEe24RpwpWgpkFQ" description="_z9q0gV4eEe2rXNsIDUvqhw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0"> 5613 <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Gl7GTGgpEe24RpwpWgpkFQ" description="_z9q0gV4eEe2rXNsIDUvqhw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
5595 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Gl7GTmgpEe24RpwpWgpkFQ" showIcon="false"> 5614 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Gl7GTmgpEe24RpwpWgpkFQ" showIcon="false">
5596 <customFeatures>labelSize</customFeatures> 5615 <customFeatures>labelSize</customFeatures>
@@ -5637,6 +5656,37 @@
5637 </ownedStyle> 5656 </ownedStyle>
5638 <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']"/> 5657 <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']"/>
5639 </ownedDiagramElements> 5658 </ownedDiagramElements>
5659 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_W7ZWoBRqEe-4k7CzzL6IsA" name="Assertion" tooltipText="" outgoingEdges="_z9q0il4eEe2rXNsIDUvqhw _kInl-BRqEe-4k7CzzL6IsA" width="12" height="10">
5660 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Assertion"/>
5661 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Assertion"/>
5662 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
5663 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
5664 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
5665 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_W7ZWoRRqEe-4k7CzzL6IsA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
5666 <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"/>
5667 </ownedStyle>
5668 <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']"/>
5669 <ownedElements xmi:type="diagram:DNodeListElement" uid="_bZWIoBRqEe-4k7CzzL6IsA" name="default : EBoolean = false" tooltipText="">
5670 <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Assertion/default"/>
5671 <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Assertion/default"/>
5672 <ownedStyle xmi:type="diagram:BundledImage" uid="_bZWIoRRqEe-4k7CzzL6IsA" labelAlignment="LEFT">
5673 <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"/>
5674 </ownedStyle>
5675 <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']"/>
5676 </ownedElements>
5677 </ownedDiagramElements>
5678 <ownedDiagramElements xmi:type="diagram:DEdge" uid="_kInl-BRqEe-4k7CzzL6IsA" sourceNode="_W7ZWoBRqEe-4k7CzzL6IsA" targetNode="_z9nxMF4eEe2rXNsIDUvqhw">
5679 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Assertion"/>
5680 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Assertion"/>
5681 <ownedStyle xmi:type="diagram:EdgeStyle" uid="_kIoM8BRqEe-4k7CzzL6IsA" targetArrow="InputClosedArrow" routingStyle="tree">
5682 <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"/>
5683 <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_kIoM8RRqEe-4k7CzzL6IsA" showIcon="false">
5684 <labelFormat>italic</labelFormat>
5685 </beginLabelStyle>
5686 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_kIoM8hRqEe-4k7CzzL6IsA" showIcon="false"/>
5687 </ownedStyle>
5688 <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']"/>
5689 </ownedDiagramElements>
5640 <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> 5690 <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
5641 <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_xj8kEF4eEe2rXNsIDUvqhw"/> 5691 <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_xj8kEF4eEe2rXNsIDUvqhw"/>
5642 <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/> 5692 <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
@@ -5654,7 +5704,7 @@
5654 <styles xmi:type="notation:FilteringStyle" xmi:id="_x-y3k14fEe2rXNsIDUvqhw"/> 5704 <styles xmi:type="notation:FilteringStyle" xmi:id="_x-y3k14fEe2rXNsIDUvqhw"/>
5655 </children> 5705 </children>
5656 <styles xmi:type="notation:ShapeStyle" xmi:id="_x-yQi14fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8" italic="true"/> 5706 <styles xmi:type="notation:ShapeStyle" xmi:id="_x-yQi14fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8" italic="true"/>
5657 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x-yQjF4fEe2rXNsIDUvqhw" x="212" y="24"/> 5707 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x-yQjF4fEe2rXNsIDUvqhw" x="36" y="36"/>
5658 </children> 5708 </children>
5659 <children xmi:type="notation:Node" xmi:id="_x-y3lF4fEe2rXNsIDUvqhw" type="2003" element="_x-t_EF4fEe2rXNsIDUvqhw"> 5709 <children xmi:type="notation:Node" xmi:id="_x-y3lF4fEe2rXNsIDUvqhw" type="2003" element="_x-t_EF4fEe2rXNsIDUvqhw">
5660 <children xmi:type="notation:Node" xmi:id="_x-y3l14fEe2rXNsIDUvqhw" type="5007"/> 5710 <children xmi:type="notation:Node" xmi:id="_x-y3l14fEe2rXNsIDUvqhw" type="5007"/>
@@ -5663,7 +5713,7 @@
5663 <styles xmi:type="notation:FilteringStyle" xmi:id="_x-y3ml4fEe2rXNsIDUvqhw"/> 5713 <styles xmi:type="notation:FilteringStyle" xmi:id="_x-y3ml4fEe2rXNsIDUvqhw"/>
5664 </children> 5714 </children>
5665 <styles xmi:type="notation:ShapeStyle" xmi:id="_x-y3lV4fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> 5715 <styles xmi:type="notation:ShapeStyle" xmi:id="_x-y3lV4fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/>
5666 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x-y3ll4fEe2rXNsIDUvqhw" x="212" y="180"/> 5716 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x-y3ll4fEe2rXNsIDUvqhw" x="120" y="192"/>
5667 </children> 5717 </children>
5668 <children xmi:type="notation:Node" xmi:id="_mjEJMF4hEe2rXNsIDUvqhw" visible="false" type="2003" element="_mi_QsF4hEe2rXNsIDUvqhw"> 5718 <children xmi:type="notation:Node" xmi:id="_mjEJMF4hEe2rXNsIDUvqhw" visible="false" type="2003" element="_mi_QsF4hEe2rXNsIDUvqhw">
5669 <children xmi:type="notation:Node" xmi:id="_mjEJM14hEe2rXNsIDUvqhw" type="5007"/> 5719 <children xmi:type="notation:Node" xmi:id="_mjEJM14hEe2rXNsIDUvqhw" type="5007"/>
@@ -5681,6 +5731,14 @@
5681 <styles xmi:type="notation:FontStyle" xmi:id="_vYOzGF4hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> 5731 <styles xmi:type="notation:FontStyle" xmi:id="_vYOzGF4hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/>
5682 <layoutConstraint xmi:type="notation:Location" xmi:id="_vYOzGV4hEe2rXNsIDUvqhw"/> 5732 <layoutConstraint xmi:type="notation:Location" xmi:id="_vYOzGV4hEe2rXNsIDUvqhw"/>
5683 </children> 5733 </children>
5734 <children xmi:type="notation:Node" xmi:id="_wueTIBRqEe-4k7CzzL6IsA" visible="false" type="3010" element="_wuaowBRqEe-4k7CzzL6IsA">
5735 <styles xmi:type="notation:FontStyle" xmi:id="_wueTIRRqEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/>
5736 <layoutConstraint xmi:type="notation:Location" xmi:id="_wueTIhRqEe-4k7CzzL6IsA"/>
5737 </children>
5738 <children xmi:type="notation:Node" xmi:id="_wueTIxRqEe-4k7CzzL6IsA" visible="false" type="3010" element="_wuaowhRqEe-4k7CzzL6IsA">
5739 <styles xmi:type="notation:FontStyle" xmi:id="_wueTJBRqEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/>
5740 <layoutConstraint xmi:type="notation:Location" xmi:id="_wueTJRRqEe-4k7CzzL6IsA"/>
5741 </children>
5684 <styles xmi:type="notation:SortingStyle" xmi:id="_vYOzFV4hEe2rXNsIDUvqhw"/> 5742 <styles xmi:type="notation:SortingStyle" xmi:id="_vYOzFV4hEe2rXNsIDUvqhw"/>
5685 <styles xmi:type="notation:FilteringStyle" xmi:id="_vYOzFl4hEe2rXNsIDUvqhw"/> 5743 <styles xmi:type="notation:FilteringStyle" xmi:id="_vYOzFl4hEe2rXNsIDUvqhw"/>
5686 </children> 5744 </children>
@@ -5712,7 +5770,7 @@
5712 <styles xmi:type="notation:ShapeStyle" xmi:id="_4xYTwV4hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> 5770 <styles xmi:type="notation:ShapeStyle" xmi:id="_4xYTwV4hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/>
5713 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4xYTwl4hEe2rXNsIDUvqhw" x="360" y="24"/> 5771 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4xYTwl4hEe2rXNsIDUvqhw" x="360" y="24"/>
5714 </children> 5772 </children>
5715 <children xmi:type="notation:Node" xmi:id="_nWw4wBOtEe-xzrPFjBSxRw" type="2003" element="_nWhBIBOtEe-xzrPFjBSxRw"> 5773 <children xmi:type="notation:Node" xmi:id="_nWw4wBOtEe-xzrPFjBSxRw" visible="false" type="2003" element="_nWhBIBOtEe-xzrPFjBSxRw">
5716 <children xmi:type="notation:Node" xmi:id="_nWxf0BOtEe-xzrPFjBSxRw" type="5007"/> 5774 <children xmi:type="notation:Node" xmi:id="_nWxf0BOtEe-xzrPFjBSxRw" type="5007"/>
5717 <children xmi:type="notation:Node" xmi:id="_nWyG4BOtEe-xzrPFjBSxRw" type="7004"> 5775 <children xmi:type="notation:Node" xmi:id="_nWyG4BOtEe-xzrPFjBSxRw" type="7004">
5718 <styles xmi:type="notation:SortingStyle" xmi:id="_nWyG4ROtEe-xzrPFjBSxRw"/> 5776 <styles xmi:type="notation:SortingStyle" xmi:id="_nWyG4ROtEe-xzrPFjBSxRw"/>
@@ -5721,7 +5779,7 @@
5721 <styles xmi:type="notation:ShapeStyle" xmi:id="_nWw4wROtEe-xzrPFjBSxRw" fontName="Noto Sans" fontHeight="8" italic="true"/> 5779 <styles xmi:type="notation:ShapeStyle" xmi:id="_nWw4wROtEe-xzrPFjBSxRw" fontName="Noto Sans" fontHeight="8" italic="true"/>
5722 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nWw4whOtEe-xzrPFjBSxRw" x="360" y="480"/> 5780 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nWw4whOtEe-xzrPFjBSxRw" x="360" y="480"/>
5723 </children> 5781 </children>
5724 <children xmi:type="notation:Node" xmi:id="_e75ZcBRWEe-4k7CzzL6IsA" type="2003" element="_e7zS0BRWEe-4k7CzzL6IsA"> 5782 <children xmi:type="notation:Node" xmi:id="_e75ZcBRWEe-4k7CzzL6IsA" visible="false" type="2003" element="_e7zS0BRWEe-4k7CzzL6IsA">
5725 <children xmi:type="notation:Node" xmi:id="_e75ZcxRWEe-4k7CzzL6IsA" type="5007"/> 5783 <children xmi:type="notation:Node" xmi:id="_e75ZcxRWEe-4k7CzzL6IsA" type="5007"/>
5726 <children xmi:type="notation:Node" xmi:id="_e75ZdBRWEe-4k7CzzL6IsA" type="7004"> 5784 <children xmi:type="notation:Node" xmi:id="_e75ZdBRWEe-4k7CzzL6IsA" type="7004">
5727 <styles xmi:type="notation:SortingStyle" xmi:id="_e75ZdRRWEe-4k7CzzL6IsA"/> 5785 <styles xmi:type="notation:SortingStyle" xmi:id="_e75ZdRRWEe-4k7CzzL6IsA"/>
@@ -5730,7 +5788,7 @@
5730 <styles xmi:type="notation:ShapeStyle" xmi:id="_e75ZcRRWEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8" italic="true"/> 5788 <styles xmi:type="notation:ShapeStyle" xmi:id="_e75ZcRRWEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8" italic="true"/>
5731 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e75ZchRWEe-4k7CzzL6IsA" x="492" y="180"/> 5789 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e75ZchRWEe-4k7CzzL6IsA" x="492" y="180"/>
5732 </children> 5790 </children>
5733 <children xmi:type="notation:Node" xmi:id="_mJXFsBRWEe-4k7CzzL6IsA" type="2003" element="_mJSNMBRWEe-4k7CzzL6IsA"> 5791 <children xmi:type="notation:Node" xmi:id="_mJXFsBRWEe-4k7CzzL6IsA" visible="false" type="2003" element="_mJSNMBRWEe-4k7CzzL6IsA">
5734 <children xmi:type="notation:Node" xmi:id="_mJXFsxRWEe-4k7CzzL6IsA" type="5007"/> 5792 <children xmi:type="notation:Node" xmi:id="_mJXFsxRWEe-4k7CzzL6IsA" type="5007"/>
5735 <children xmi:type="notation:Node" xmi:id="_mJXFtBRWEe-4k7CzzL6IsA" type="7004"> 5793 <children xmi:type="notation:Node" xmi:id="_mJXFtBRWEe-4k7CzzL6IsA" type="7004">
5736 <styles xmi:type="notation:SortingStyle" xmi:id="_mJXFtRRWEe-4k7CzzL6IsA"/> 5794 <styles xmi:type="notation:SortingStyle" xmi:id="_mJXFtRRWEe-4k7CzzL6IsA"/>
@@ -5739,6 +5797,27 @@
5739 <styles xmi:type="notation:ShapeStyle" xmi:id="_mJXFsRRWEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8" italic="true"/> 5797 <styles xmi:type="notation:ShapeStyle" xmi:id="_mJXFsRRWEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8" italic="true"/>
5740 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mJXFshRWEe-4k7CzzL6IsA" x="95" y="480"/> 5798 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mJXFshRWEe-4k7CzzL6IsA" x="95" y="480"/>
5741 </children> 5799 </children>
5800 <children xmi:type="notation:Node" xmi:id="_wudsFhRqEe-4k7CzzL6IsA" type="2003" element="_wuYMgBRqEe-4k7CzzL6IsA">
5801 <children xmi:type="notation:Node" xmi:id="_wudsGRRqEe-4k7CzzL6IsA" type="5007"/>
5802 <children xmi:type="notation:Node" xmi:id="_wudsGhRqEe-4k7CzzL6IsA" type="7004">
5803 <children xmi:type="notation:Node" xmi:id="_wueTJhRqEe-4k7CzzL6IsA" type="3010" element="_wubP0BRqEe-4k7CzzL6IsA">
5804 <styles xmi:type="notation:FontStyle" xmi:id="_wueTJxRqEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/>
5805 <layoutConstraint xmi:type="notation:Location" xmi:id="_wueTKBRqEe-4k7CzzL6IsA"/>
5806 </children>
5807 <children xmi:type="notation:Node" xmi:id="_wueTKRRqEe-4k7CzzL6IsA" type="3010" element="_wubP0hRqEe-4k7CzzL6IsA">
5808 <styles xmi:type="notation:FontStyle" xmi:id="_wueTKhRqEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/>
5809 <layoutConstraint xmi:type="notation:Location" xmi:id="_wueTKxRqEe-4k7CzzL6IsA"/>
5810 </children>
5811 <children xmi:type="notation:Node" xmi:id="_wueTLBRqEe-4k7CzzL6IsA" type="3010" element="_wubP1BRqEe-4k7CzzL6IsA">
5812 <styles xmi:type="notation:FontStyle" xmi:id="_wueTLRRqEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/>
5813 <layoutConstraint xmi:type="notation:Location" xmi:id="_wueTLhRqEe-4k7CzzL6IsA"/>
5814 </children>
5815 <styles xmi:type="notation:SortingStyle" xmi:id="_wudsGxRqEe-4k7CzzL6IsA"/>
5816 <styles xmi:type="notation:FilteringStyle" xmi:id="_wudsHBRqEe-4k7CzzL6IsA"/>
5817 </children>
5818 <styles xmi:type="notation:ShapeStyle" xmi:id="_wudsFxRqEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8" italic="true"/>
5819 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wudsGBRqEe-4k7CzzL6IsA" x="240" y="36"/>
5820 </children>
5742 <styles xmi:type="notation:DiagramStyle" xmi:id="_sCFolF4fEe2rXNsIDUvqhw"/> 5821 <styles xmi:type="notation:DiagramStyle" xmi:id="_sCFolF4fEe2rXNsIDUvqhw"/>
5743 <edges xmi:type="notation:Edge" xmi:id="_x-0sw14fEe2rXNsIDUvqhw" type="4001" element="_x-xpcV4fEe2rXNsIDUvqhw" source="_x-y3lF4fEe2rXNsIDUvqhw" target="_x-yQil4fEe2rXNsIDUvqhw"> 5822 <edges xmi:type="notation:Edge" xmi:id="_x-0sw14fEe2rXNsIDUvqhw" type="4001" element="_x-xpcV4fEe2rXNsIDUvqhw" source="_x-y3lF4fEe2rXNsIDUvqhw" target="_x-yQil4fEe2rXNsIDUvqhw">
5744 <children xmi:type="notation:Node" xmi:id="_x-0sx14fEe2rXNsIDUvqhw" type="6001"> 5823 <children xmi:type="notation:Node" xmi:id="_x-0sx14fEe2rXNsIDUvqhw" type="6001">
@@ -5756,80 +5835,80 @@
5756 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_STXQEBOwEe-4k7CzzL6IsA" id="(0.2627118644067797,0.10204081632653061)"/> 5835 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_STXQEBOwEe-4k7CzzL6IsA" id="(0.2627118644067797,0.10204081632653061)"/>
5757 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_x-0szl4fEe2rXNsIDUvqhw" id="(0.5,0.5)"/> 5836 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_x-0szl4fEe2rXNsIDUvqhw" id="(0.5,0.5)"/>
5758 </edges> 5837 </edges>
5759 <edges xmi:type="notation:Edge" xmi:id="_nW3mchOtEe-xzrPFjBSxRw" visible="false" type="4001" element="_nWqyLBOtEe-xzrPFjBSxRw" source="_vYOzEF4hEe2rXNsIDUvqhw" target="_nWw4wBOtEe-xzrPFjBSxRw"> 5838 <edges xmi:type="notation:Edge" xmi:id="_wue6MBRqEe-4k7CzzL6IsA" visible="false" type="4001" element="_wub25hRqEe-4k7CzzL6IsA" source="_wudsFhRqEe-4k7CzzL6IsA" target="_mJXFsBRWEe-4k7CzzL6IsA">
5760 <children xmi:type="notation:Node" xmi:id="_nW4NgBOtEe-xzrPFjBSxRw" type="6001"> 5839 <children xmi:type="notation:Node" xmi:id="_wue6NBRqEe-4k7CzzL6IsA" type="6001">
5761 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nW4NgROtEe-xzrPFjBSxRw" x="-20" y="-10"/> 5840 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wue6NRRqEe-4k7CzzL6IsA" y="-10"/>
5762 </children> 5841 </children>
5763 <children xmi:type="notation:Node" xmi:id="_nW4NghOtEe-xzrPFjBSxRw" type="6002"> 5842 <children xmi:type="notation:Node" xmi:id="_wufhQBRqEe-4k7CzzL6IsA" type="6002">
5764 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nW4NgxOtEe-xzrPFjBSxRw" y="10"/> 5843 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wufhQRRqEe-4k7CzzL6IsA" y="10"/>
5765 </children> 5844 </children>
5766 <children xmi:type="notation:Node" xmi:id="_nW4NhBOtEe-xzrPFjBSxRw" type="6003"> 5845 <children xmi:type="notation:Node" xmi:id="_wufhQhRqEe-4k7CzzL6IsA" type="6003">
5767 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nW4NhROtEe-xzrPFjBSxRw" x="-20" y="10"/> 5846 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wufhQxRqEe-4k7CzzL6IsA" y="10"/>
5768 </children> 5847 </children>
5769 <styles xmi:type="notation:ConnectorStyle" xmi:id="_nW3mcxOtEe-xzrPFjBSxRw" routing="Tree"/> 5848 <styles xmi:type="notation:ConnectorStyle" xmi:id="_wue6MRRqEe-4k7CzzL6IsA" routing="Rectilinear"/>
5770 <styles xmi:type="notation:FontStyle" xmi:id="_nW3mdBOtEe-xzrPFjBSxRw" fontName="Noto Sans" fontHeight="8"/> 5849 <styles xmi:type="notation:FontStyle" xmi:id="_wue6MhRqEe-4k7CzzL6IsA" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
5771 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nW3mdROtEe-xzrPFjBSxRw" points="[0, 49, 161, -131]$[0, 95, 161, -85]$[-160, 95, 1, -85]$[-160, 131, 1, -49]"/> 5850 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wue6MxRqEe-4k7CzzL6IsA" points="[-60, 0, 1322, 63]$[-710, 0, 672, 63]$[-710, -63, 672, 0]$[-1361, -63, 21, 0]"/>
5772 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nW4NhhOtEe-xzrPFjBSxRw" id="(0.5,0.5)"/> 5851 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wufhRBRqEe-4k7CzzL6IsA" id="(0.5,0.5)"/>
5773 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nW4NhxOtEe-xzrPFjBSxRw" id="(0.5,0.5)"/> 5852 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wufhRRRqEe-4k7CzzL6IsA" id="(0.5,0.5)"/>
5774 </edges> 5853 </edges>
5775 <edges xmi:type="notation:Edge" xmi:id="_syOb4BOtEe-xzrPFjBSxRw" type="4001" element="_sxjtgBOtEe-xzrPFjBSxRw" source="_x-y3lF4fEe2rXNsIDUvqhw" target="_nWw4wBOtEe-xzrPFjBSxRw"> 5854 <edges xmi:type="notation:Edge" xmi:id="_wufhRhRqEe-4k7CzzL6IsA" visible="false" type="4001" element="_wucd8xRqEe-4k7CzzL6IsA" source="_wudsFhRqEe-4k7CzzL6IsA" target="_e75ZcBRWEe-4k7CzzL6IsA">
5776 <children xmi:type="notation:Node" xmi:id="_syPC8BOtEe-xzrPFjBSxRw" type="6001"> 5855 <children xmi:type="notation:Node" xmi:id="_wugIUxRqEe-4k7CzzL6IsA" type="6001">
5777 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_syPC8ROtEe-xzrPFjBSxRw" x="5" y="-16"/> 5856 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wugIVBRqEe-4k7CzzL6IsA" y="-10"/>
5778 </children> 5857 </children>
5779 <children xmi:type="notation:Node" xmi:id="_syPC8hOtEe-xzrPFjBSxRw" type="6002"> 5858 <children xmi:type="notation:Node" xmi:id="_wugIVRRqEe-4k7CzzL6IsA" type="6002">
5780 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_syPC8xOtEe-xzrPFjBSxRw" x="43"/> 5859 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wugIVhRqEe-4k7CzzL6IsA" y="10"/>
5781 </children> 5860 </children>
5782 <children xmi:type="notation:Node" xmi:id="_syPC9BOtEe-xzrPFjBSxRw" type="6003"> 5861 <children xmi:type="notation:Node" xmi:id="_wugIVxRqEe-4k7CzzL6IsA" type="6003">
5783 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_syPC9ROtEe-xzrPFjBSxRw" x="-48" y="75"/> 5862 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wugIWBRqEe-4k7CzzL6IsA" y="10"/>
5784 </children> 5863 </children>
5785 <styles xmi:type="notation:ConnectorStyle" xmi:id="_syOb4ROtEe-xzrPFjBSxRw" routing="Rectilinear"/> 5864 <styles xmi:type="notation:ConnectorStyle" xmi:id="_wugIUBRqEe-4k7CzzL6IsA" routing="Rectilinear"/>
5786 <styles xmi:type="notation:FontStyle" xmi:id="_syOb4hOtEe-xzrPFjBSxRw" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> 5865 <styles xmi:type="notation:FontStyle" xmi:id="_wugIURRqEe-4k7CzzL6IsA" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
5787 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_syOb4xOtEe-xzrPFjBSxRw" points="[49, 0, -109, -202]$[49, 94, -109, -108]$[179, 94, 21, -108]$[179, 202, 21, 0]"/> 5866 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wugIUhRqEe-4k7CzzL6IsA" points="[-60, 0, 925, 363]$[-521, 0, 464, 363]$[-521, -363, 464, 0]$[-983, -363, 2, 0]"/>
5788 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_syPC9hOtEe-xzrPFjBSxRw" id="(0.23121387283236994,1.0)"/> 5867 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wugvYBRqEe-4k7CzzL6IsA" id="(0.5,0.5)"/>
5789 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_syPC9xOtEe-xzrPFjBSxRw" id="(0.3135593220338983,0.0)"/> 5868 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wugvYRRqEe-4k7CzzL6IsA" id="(0.5,0.5)"/>
5790 </edges> 5869 </edges>
5791 <edges xmi:type="notation:Edge" xmi:id="_hHiKkBRWEe-4k7CzzL6IsA" type="4001" element="_hHIh9hRWEe-4k7CzzL6IsA" source="_x-y3lF4fEe2rXNsIDUvqhw" target="_e75ZcBRWEe-4k7CzzL6IsA"> 5870 <edges xmi:type="notation:Edge" xmi:id="_wugvYhRqEe-4k7CzzL6IsA" visible="false" type="4001" element="_wudFAxRqEe-4k7CzzL6IsA" source="_wudsFhRqEe-4k7CzzL6IsA" target="_nWw4wBOtEe-xzrPFjBSxRw">
5792 <children xmi:type="notation:Node" xmi:id="_hHixoBRWEe-4k7CzzL6IsA" type="6001"> 5871 <children xmi:type="notation:Node" xmi:id="_wugvZhRqEe-4k7CzzL6IsA" type="6001">
5793 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hHixoRRWEe-4k7CzzL6IsA" y="-10"/> 5872 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wugvZxRqEe-4k7CzzL6IsA" y="-10"/>
5794 </children> 5873 </children>
5795 <children xmi:type="notation:Node" xmi:id="_hHixohRWEe-4k7CzzL6IsA" type="6002"> 5874 <children xmi:type="notation:Node" xmi:id="_wugvaBRqEe-4k7CzzL6IsA" type="6002">
5796 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hHixoxRWEe-4k7CzzL6IsA" y="10"/> 5875 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wugvaRRqEe-4k7CzzL6IsA" y="10"/>
5797 </children> 5876 </children>
5798 <children xmi:type="notation:Node" xmi:id="_hHixpBRWEe-4k7CzzL6IsA" type="6003"> 5877 <children xmi:type="notation:Node" xmi:id="_wugvahRqEe-4k7CzzL6IsA" type="6003">
5799 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hHixpRRWEe-4k7CzzL6IsA" y="10"/> 5878 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wugvaxRqEe-4k7CzzL6IsA" y="10"/>
5800 </children> 5879 </children>
5801 <styles xmi:type="notation:ConnectorStyle" xmi:id="_hHiKkRRWEe-4k7CzzL6IsA" routing="Rectilinear"/> 5880 <styles xmi:type="notation:ConnectorStyle" xmi:id="_wugvYxRqEe-4k7CzzL6IsA" routing="Rectilinear"/>
5802 <styles xmi:type="notation:FontStyle" xmi:id="_hHiKkhRWEe-4k7CzzL6IsA" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> 5881 <styles xmi:type="notation:FontStyle" xmi:id="_wugvZBRqEe-4k7CzzL6IsA" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
5803 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hHiKkxRWEe-4k7CzzL6IsA" points="[0, 0, -162, 0]$[162, 0, 0, 0]"/> 5882 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wugvZRRqEe-4k7CzzL6IsA" points="[-60, 0, 1057, 63]$[-580, 0, 537, 63]$[-580, -63, 537, 0]$[-1100, -63, 17, 0]"/>
5804 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hHjYsBRWEe-4k7CzzL6IsA" id="(1.0,0.5)"/> 5883 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wuhWcBRqEe-4k7CzzL6IsA" id="(0.5,0.5)"/>
5805 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hHjYsRRWEe-4k7CzzL6IsA" id="(0.0,0.5)"/> 5884 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wuhWcRRqEe-4k7CzzL6IsA" id="(0.5,0.5)"/>
5806 </edges> 5885 </edges>
5807 <edges xmi:type="notation:Edge" xmi:id="_q3XtCBRWEe-4k7CzzL6IsA" type="4001" element="_q2tloxRWEe-4k7CzzL6IsA" source="_x-y3lF4fEe2rXNsIDUvqhw" target="_mJXFsBRWEe-4k7CzzL6IsA"> 5886 <edges xmi:type="notation:Edge" xmi:id="_xsGZBhRqEe-4k7CzzL6IsA" type="4001" element="_xrullhRqEe-4k7CzzL6IsA" source="_x-y3lF4fEe2rXNsIDUvqhw" target="_wudsFhRqEe-4k7CzzL6IsA">
5808 <children xmi:type="notation:Node" xmi:id="_q3YUABRWEe-4k7CzzL6IsA" type="6001"> 5887 <children xmi:type="notation:Node" xmi:id="_xsGZChRqEe-4k7CzzL6IsA" type="6001">
5809 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q3YUARRWEe-4k7CzzL6IsA" x="-16" y="-10"/> 5888 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xsGZCxRqEe-4k7CzzL6IsA" y="-10"/>
5810 </children> 5889 </children>
5811 <children xmi:type="notation:Node" xmi:id="_q3YUAhRWEe-4k7CzzL6IsA" type="6002"> 5890 <children xmi:type="notation:Node" xmi:id="_xsGZDBRqEe-4k7CzzL6IsA" type="6002">
5812 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q3YUAxRWEe-4k7CzzL6IsA" x="3" y="10"/> 5891 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xsGZDRRqEe-4k7CzzL6IsA" y="10"/>
5813 </children> 5892 </children>
5814 <children xmi:type="notation:Node" xmi:id="_q3YUBBRWEe-4k7CzzL6IsA" type="6003"> 5893 <children xmi:type="notation:Node" xmi:id="_xsGZDhRqEe-4k7CzzL6IsA" type="6003">
5815 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q3YUBRRWEe-4k7CzzL6IsA" x="-3" y="10"/> 5894 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xsGZDxRqEe-4k7CzzL6IsA" y="10"/>
5816 </children> 5895 </children>
5817 <styles xmi:type="notation:ConnectorStyle" xmi:id="_q3XtCRRWEe-4k7CzzL6IsA" routing="Rectilinear"/> 5896 <styles xmi:type="notation:ConnectorStyle" xmi:id="_xsGZBxRqEe-4k7CzzL6IsA" routing="Tree"/>
5818 <styles xmi:type="notation:FontStyle" xmi:id="_q3XtChRWEe-4k7CzzL6IsA" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> 5897 <styles xmi:type="notation:FontStyle" xmi:id="_xsGZCBRqEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/>
5819 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_q3XtCxRWEe-4k7CzzL6IsA" points="[-19, 0, 108, -202]$[-19, 94, 108, -108]$[-127, 94, 0, -108]$[-127, 202, 0, 0]"/> 5898 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xsGZCRRqEe-4k7CzzL6IsA" points="[0, 0, -72, 144]$[72, -144, 0, 0]"/>
5820 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_q3YUBhRWEe-4k7CzzL6IsA" id="(0.5,1.0)"/> 5899 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xsGZEBRqEe-4k7CzzL6IsA" id="(0.7627118644067796,0.14285714285714285)"/>
5821 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_q3YUBxRWEe-4k7CzzL6IsA" id="(0.4152542372881356,0.0)"/> 5900 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xsGZERRqEe-4k7CzzL6IsA" id="(0.5,0.5)"/>
5822 </edges> 5901 </edges>
5823 </data> 5902 </data>
5824 </ownedAnnotationEntries> 5903 </ownedAnnotationEntries>
5825 <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_sCG2sV4fEe2rXNsIDUvqhw" source="DANNOTATION_CUSTOMIZATION_KEY"> 5904 <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_sCG2sV4fEe2rXNsIDUvqhw" source="DANNOTATION_CUSTOMIZATION_KEY">
5826 <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_sCG2sl4fEe2rXNsIDUvqhw"> 5905 <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_sCG2sl4fEe2rXNsIDUvqhw">
5827 <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_1WX3YV4fEe2rXNsIDUvqhw" sourceArrow="FillDiamond" routingStyle="manhattan"> 5906 <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_wub25xRqEe-4k7CzzL6IsA" sourceArrow="FillDiamond" routingStyle="manhattan">
5828 <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> 5907 <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
5829 <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_1WX3Yl4fEe2rXNsIDUvqhw" showIcon="false" labelExpression="service:render"> 5908 <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_wub26BRqEe-4k7CzzL6IsA" showIcon="false" labelExpression="service:render">
5830 <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> 5909 <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
5831 </centerLabelStyleDescription> 5910 </centerLabelStyleDescription>
5832 <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_1WX3Y14fEe2rXNsIDUvqhw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel"> 5911 <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_wub26RRqEe-4k7CzzL6IsA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
5833 <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> 5912 <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
5834 </endLabelStyleDescription> 5913 </endLabelStyleDescription>
5835 </computedStyleDescriptions> 5914 </computedStyleDescriptions>
@@ -5841,13 +5920,13 @@
5841 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> 5920 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
5842 <arrangeConstraints>KEEP_SIZE</arrangeConstraints> 5921 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
5843 <arrangeConstraints>KEEP_RATIO</arrangeConstraints> 5922 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
5844 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_x-tYAV4fEe2rXNsIDUvqhw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228"> 5923 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_tGqe8RRqEe-4k7CzzL6IsA" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
5845 <labelFormat>italic</labelFormat> 5924 <labelFormat>italic</labelFormat>
5846 <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']/@conditionnalStyles.1/@style"/> 5925 <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']/@conditionnalStyles.0/@style"/>
5847 </ownedStyle> 5926 </ownedStyle>
5848 <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']"/> 5927 <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']"/>
5849 </ownedDiagramElements> 5928 </ownedDiagramElements>
5850 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_x-t_EF4fEe2rXNsIDUvqhw" name="AssertionAction" tooltipText="" outgoingEdges="_x-xpcV4fEe2rXNsIDUvqhw _sxjtgBOtEe-xzrPFjBSxRw _hHIh9hRWEe-4k7CzzL6IsA _q2tloxRWEe-4k7CzzL6IsA" width="12" height="10"> 5929 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_x-t_EF4fEe2rXNsIDUvqhw" name="AssertionAction" tooltipText="" outgoingEdges="_x-xpcV4fEe2rXNsIDUvqhw _xrullhRqEe-4k7CzzL6IsA" width="12" height="10">
5851 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionAction"/> 5930 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionAction"/>
5852 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionAction"/> 5931 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionAction"/>
5853 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> 5932 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -5861,12 +5940,12 @@
5861 <ownedDiagramElements xmi:type="diagram:DEdge" uid="_x-xpcV4fEe2rXNsIDUvqhw" sourceNode="_x-t_EF4fEe2rXNsIDUvqhw" targetNode="_x-tYAF4fEe2rXNsIDUvqhw"> 5940 <ownedDiagramElements xmi:type="diagram:DEdge" uid="_x-xpcV4fEe2rXNsIDUvqhw" sourceNode="_x-t_EF4fEe2rXNsIDUvqhw" targetNode="_x-tYAF4fEe2rXNsIDUvqhw">
5862 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionAction"/> 5941 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionAction"/>
5863 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionAction"/> 5942 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionAction"/>
5864 <ownedStyle xmi:type="diagram:EdgeStyle" uid="_x-xpcl4fEe2rXNsIDUvqhw" targetArrow="InputClosedArrow" routingStyle="tree"> 5943 <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tGrGBhRqEe-4k7CzzL6IsA" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
5865 <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"/> 5944 <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']/@conditionnalStyles.0/@style"/>
5866 <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_x-xpc14fEe2rXNsIDUvqhw" showIcon="false"> 5945 <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_tGrGBxRqEe-4k7CzzL6IsA" showIcon="false">
5867 <labelFormat>italic</labelFormat> 5946 <labelFormat>italic</labelFormat>
5868 </beginLabelStyle> 5947 </beginLabelStyle>
5869 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_x-xpdF4fEe2rXNsIDUvqhw" showIcon="false"/> 5948 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tGrGCBRqEe-4k7CzzL6IsA" showIcon="false"/>
5870 </ownedStyle> 5949 </ownedStyle>
5871 <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']"/> 5950 <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']"/>
5872 </ownedDiagramElements> 5951 </ownedDiagramElements>
@@ -5883,7 +5962,7 @@
5883 </ownedStyle> 5962 </ownedStyle>
5884 <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']"/> 5963 <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']"/>
5885 </ownedDiagramElements> 5964 </ownedDiagramElements>
5886 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_vYLvwF4hEe2rXNsIDUvqhw" name="Atom" visible="false" tooltipText="" outgoingEdges="_nWqyLBOtEe-xzrPFjBSxRw" width="12" height="10"> 5965 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_vYLvwF4hEe2rXNsIDUvqhw" name="Atom" visible="false" tooltipText="" width="12" height="10">
5887 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Atom"/> 5966 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Atom"/>
5888 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Atom"/> 5967 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Atom"/>
5889 <graphicalFilters xmi:type="diagram:HideFilter" uid="_c74pgBRWEe-4k7CzzL6IsA"/> 5968 <graphicalFilters xmi:type="diagram:HideFilter" uid="_c74pgBRWEe-4k7CzzL6IsA"/>
@@ -5902,6 +5981,22 @@
5902 </ownedStyle> 5981 </ownedStyle>
5903 <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']"/> 5982 <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']"/>
5904 </ownedElements> 5983 </ownedElements>
5984 <ownedElements xmi:type="diagram:DNodeListElement" uid="_wuaowBRqEe-4k7CzzL6IsA" name=" arguments : Expr" visible="false" tooltipText="">
5985 <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Atom/arguments"/>
5986 <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Atom/arguments"/>
5987 <ownedStyle xmi:type="diagram:BundledImage" uid="_wuaowRRqEe-4k7CzzL6IsA" labelAlignment="LEFT" color="114,159,207">
5988 <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%20EReferenceNode']/@style"/>
5989 </ownedStyle>
5990 <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%20EReferenceNode']"/>
5991 </ownedElements>
5992 <ownedElements xmi:type="diagram:DNodeListElement" uid="_wuaowhRqEe-4k7CzzL6IsA" name=" relation : Relation" visible="false" tooltipText="">
5993 <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Atom/relation"/>
5994 <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Atom/relation"/>
5995 <ownedStyle xmi:type="diagram:BundledImage" uid="_wuaowxRqEe-4k7CzzL6IsA" labelAlignment="LEFT" color="114,159,207">
5996 <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%20EReferenceNode']/@style"/>
5997 </ownedStyle>
5998 <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%20EReferenceNode']"/>
5999 </ownedElements>
5905 </ownedDiagramElements> 6000 </ownedDiagramElements>
5906 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_4xTbQF4hEe2rXNsIDUvqhw" name="LogicValue" visible="false" tooltipText="" width="12" height="10"> 6001 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_4xTbQF4hEe2rXNsIDUvqhw" name="LogicValue" visible="false" tooltipText="" width="12" height="10">
5907 <target xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//LogicValue"/> 6002 <target xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//LogicValue"/>
@@ -5947,9 +6042,10 @@
5947 <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']"/> 6042 <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']"/>
5948 </ownedElements> 6043 </ownedElements>
5949 </ownedDiagramElements> 6044 </ownedDiagramElements>
5950 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_nWhBIBOtEe-xzrPFjBSxRw" name="Expr" tooltipText="" incomingEdges="_nWqyLBOtEe-xzrPFjBSxRw _sxjtgBOtEe-xzrPFjBSxRw" width="12" height="10"> 6045 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_nWhBIBOtEe-xzrPFjBSxRw" name="Expr" visible="false" tooltipText="" incomingEdges="_wudFAxRqEe-4k7CzzL6IsA" width="12" height="10">
5951 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Expr"/> 6046 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Expr"/>
5952 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Expr"/> 6047 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Expr"/>
6048 <graphicalFilters xmi:type="diagram:HideFilter" uid="_t6GuERRqEe-4k7CzzL6IsA"/>
5953 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> 6049 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
5954 <arrangeConstraints>KEEP_SIZE</arrangeConstraints> 6050 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
5955 <arrangeConstraints>KEEP_RATIO</arrangeConstraints> 6051 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -5959,30 +6055,10 @@
5959 </ownedStyle> 6055 </ownedStyle>
5960 <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']"/> 6056 <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']"/>
5961 </ownedDiagramElements> 6057 </ownedDiagramElements>
5962 <ownedDiagramElements xmi:type="diagram:DEdge" uid="_nWqyLBOtEe-xzrPFjBSxRw" visible="false" sourceNode="_vYLvwF4hEe2rXNsIDUvqhw" targetNode="_nWhBIBOtEe-xzrPFjBSxRw"> 6058 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_e7zS0BRWEe-4k7CzzL6IsA" name="Relation" visible="false" tooltipText="" incomingEdges="_wucd8xRqEe-4k7CzzL6IsA" width="12" height="10">
5963 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Atom"/>
5964 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Atom"/>
5965 <ownedStyle xmi:type="diagram:EdgeStyle" uid="_nWqyLROtEe-xzrPFjBSxRw" targetArrow="InputClosedArrow" routingStyle="tree">
5966 <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"/>
5967 <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_nWqyLhOtEe-xzrPFjBSxRw" showIcon="false">
5968 <labelFormat>italic</labelFormat>
5969 </beginLabelStyle>
5970 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_nWqyLxOtEe-xzrPFjBSxRw" showIcon="false"/>
5971 </ownedStyle>
5972 <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']"/>
5973 </ownedDiagramElements>
5974 <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sxjtgBOtEe-xzrPFjBSxRw" name="[0..1] value" sourceNode="_x-t_EF4fEe2rXNsIDUvqhw" targetNode="_nWhBIBOtEe-xzrPFjBSxRw">
5975 <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AssertionAction/value"/>
5976 <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AssertionAction/value"/>
5977 <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sxkUkBOtEe-xzrPFjBSxRw" description="_1WX3YV4fEe2rXNsIDUvqhw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
5978 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sxkUkhOtEe-xzrPFjBSxRw" showIcon="false"/>
5979 <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sxkUkROtEe-xzrPFjBSxRw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
5980 </ownedStyle>
5981 <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']"/>
5982 </ownedDiagramElements>
5983 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_e7zS0BRWEe-4k7CzzL6IsA" name="Relation" tooltipText="" incomingEdges="_hHIh9hRWEe-4k7CzzL6IsA" width="12" height="10">
5984 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Relation"/> 6059 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Relation"/>
5985 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Relation"/> 6060 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Relation"/>
6061 <graphicalFilters xmi:type="diagram:HideFilter" uid="_t6GuEBRqEe-4k7CzzL6IsA"/>
5986 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> 6062 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
5987 <arrangeConstraints>KEEP_SIZE</arrangeConstraints> 6063 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
5988 <arrangeConstraints>KEEP_RATIO</arrangeConstraints> 6064 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -5992,19 +6068,10 @@
5992 </ownedStyle> 6068 </ownedStyle>
5993 <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']"/> 6069 <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']"/>
5994 </ownedDiagramElements> 6070 </ownedDiagramElements>
5995 <ownedDiagramElements xmi:type="diagram:DEdge" uid="_hHIh9hRWEe-4k7CzzL6IsA" name="[0..1] relation" sourceNode="_x-t_EF4fEe2rXNsIDUvqhw" targetNode="_e7zS0BRWEe-4k7CzzL6IsA"> 6071 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_mJSNMBRWEe-4k7CzzL6IsA" name="AssertionArgument" visible="false" tooltipText="" incomingEdges="_wub25hRqEe-4k7CzzL6IsA" width="12" height="10">
5996 <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AssertionAction/relation"/>
5997 <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AssertionAction/relation"/>
5998 <ownedStyle xmi:type="diagram:EdgeStyle" uid="_hHIh9xRWEe-4k7CzzL6IsA" routingStyle="manhattan" strokeColor="0,0,0">
5999 <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"/>
6000 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_hHIh-RRWEe-4k7CzzL6IsA" showIcon="false"/>
6001 <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_hHIh-BRWEe-4k7CzzL6IsA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
6002 </ownedStyle>
6003 <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']"/>
6004 </ownedDiagramElements>
6005 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_mJSNMBRWEe-4k7CzzL6IsA" name="AssertionArgument" tooltipText="" incomingEdges="_q2tloxRWEe-4k7CzzL6IsA" width="12" height="10">
6006 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionArgument"/> 6072 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionArgument"/>
6007 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionArgument"/> 6073 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionArgument"/>
6074 <graphicalFilters xmi:type="diagram:HideFilter" uid="_ug9SsBRqEe-4k7CzzL6IsA"/>
6008 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> 6075 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
6009 <arrangeConstraints>KEEP_SIZE</arrangeConstraints> 6076 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
6010 <arrangeConstraints>KEEP_RATIO</arrangeConstraints> 6077 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -6014,15 +6081,82 @@
6014 </ownedStyle> 6081 </ownedStyle>
6015 <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']"/> 6082 <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']"/>
6016 </ownedDiagramElements> 6083 </ownedDiagramElements>
6017 <ownedDiagramElements xmi:type="diagram:DEdge" uid="_q2tloxRWEe-4k7CzzL6IsA" name="[0..*] arguments" sourceNode="_x-t_EF4fEe2rXNsIDUvqhw" targetNode="_mJSNMBRWEe-4k7CzzL6IsA"> 6084 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_wuYMgBRqEe-4k7CzzL6IsA" name="AbstractAssertion" tooltipText="" outgoingEdges="_wub25hRqEe-4k7CzzL6IsA _wucd8xRqEe-4k7CzzL6IsA _wudFAxRqEe-4k7CzzL6IsA" incomingEdges="_xrullhRqEe-4k7CzzL6IsA" width="12" height="10">
6018 <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AssertionAction/arguments"/> 6085 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AbstractAssertion"/>
6019 <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AssertionAction/arguments"/> 6086 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AbstractAssertion"/>
6020 <ownedStyle xmi:type="diagram:EdgeStyle" uid="_q2uzwBRWEe-4k7CzzL6IsA" description="_1WX3YV4fEe2rXNsIDUvqhw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0"> 6087 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
6021 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_q2uzwhRWEe-4k7CzzL6IsA" showIcon="false"/> 6088 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
6022 <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_q2uzwRRWEe-4k7CzzL6IsA" labelSize="6" showIcon="false" labelColor="39,76,114"/> 6089 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
6090 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_wuYMgRRqEe-4k7CzzL6IsA" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
6091 <labelFormat>italic</labelFormat>
6092 <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']/@conditionnalStyles.1/@style"/>
6093 </ownedStyle>
6094 <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']"/>
6095 <ownedElements xmi:type="diagram:DNodeListElement" uid="_wubP0BRqEe-4k7CzzL6IsA" name=" arguments : AssertionArgument" tooltipText="">
6096 <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AbstractAssertion/arguments"/>
6097 <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AbstractAssertion/arguments"/>
6098 <ownedStyle xmi:type="diagram:BundledImage" uid="_wubP0RRqEe-4k7CzzL6IsA" labelAlignment="LEFT" color="114,159,207">
6099 <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%20EReferenceNode']/@style"/>
6100 </ownedStyle>
6101 <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%20EReferenceNode']"/>
6102 </ownedElements>
6103 <ownedElements xmi:type="diagram:DNodeListElement" uid="_wubP0hRqEe-4k7CzzL6IsA" name=" relation : Relation" tooltipText="">
6104 <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AbstractAssertion/relation"/>
6105 <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AbstractAssertion/relation"/>
6106 <ownedStyle xmi:type="diagram:BundledImage" uid="_wubP0xRqEe-4k7CzzL6IsA" labelAlignment="LEFT" color="114,159,207">
6107 <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%20EReferenceNode']/@style"/>
6108 </ownedStyle>
6109 <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%20EReferenceNode']"/>
6110 </ownedElements>
6111 <ownedElements xmi:type="diagram:DNodeListElement" uid="_wubP1BRqEe-4k7CzzL6IsA" name=" value : Expr" tooltipText="">
6112 <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AbstractAssertion/value"/>
6113 <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AbstractAssertion/value"/>
6114 <ownedStyle xmi:type="diagram:BundledImage" uid="_wubP1RRqEe-4k7CzzL6IsA" labelAlignment="LEFT" color="114,159,207">
6115 <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%20EReferenceNode']/@style"/>
6116 </ownedStyle>
6117 <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%20EReferenceNode']"/>
6118 </ownedElements>
6119 </ownedDiagramElements>
6120 <ownedDiagramElements xmi:type="diagram:DEdge" uid="_wub25hRqEe-4k7CzzL6IsA" name="[0..*] arguments" visible="false" sourceNode="_wuYMgBRqEe-4k7CzzL6IsA" targetNode="_mJSNMBRWEe-4k7CzzL6IsA">
6121 <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AbstractAssertion/arguments"/>
6122 <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AbstractAssertion/arguments"/>
6123 <ownedStyle xmi:type="diagram:EdgeStyle" uid="_wub26hRqEe-4k7CzzL6IsA" description="_wub25xRqEe-4k7CzzL6IsA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
6124 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_wub27BRqEe-4k7CzzL6IsA" showIcon="false"/>
6125 <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_wub26xRqEe-4k7CzzL6IsA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
6023 </ownedStyle> 6126 </ownedStyle>
6024 <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']"/> 6127 <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']"/>
6025 </ownedDiagramElements> 6128 </ownedDiagramElements>
6129 <ownedDiagramElements xmi:type="diagram:DEdge" uid="_wucd8xRqEe-4k7CzzL6IsA" name="[0..1] relation" visible="false" sourceNode="_wuYMgBRqEe-4k7CzzL6IsA" targetNode="_e7zS0BRWEe-4k7CzzL6IsA">
6130 <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AbstractAssertion/relation"/>
6131 <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AbstractAssertion/relation"/>
6132 <ownedStyle xmi:type="diagram:EdgeStyle" uid="_wucd9BRqEe-4k7CzzL6IsA" routingStyle="manhattan" strokeColor="0,0,0">
6133 <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"/>
6134 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_wucd9hRqEe-4k7CzzL6IsA" showIcon="false"/>
6135 <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_wucd9RRqEe-4k7CzzL6IsA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
6136 </ownedStyle>
6137 <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']"/>
6138 </ownedDiagramElements>
6139 <ownedDiagramElements xmi:type="diagram:DEdge" uid="_wudFAxRqEe-4k7CzzL6IsA" name="[0..1] value" visible="false" sourceNode="_wuYMgBRqEe-4k7CzzL6IsA" targetNode="_nWhBIBOtEe-xzrPFjBSxRw">
6140 <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AbstractAssertion/value"/>
6141 <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AbstractAssertion/value"/>
6142 <ownedStyle xmi:type="diagram:EdgeStyle" uid="_wudFBBRqEe-4k7CzzL6IsA" description="_wub25xRqEe-4k7CzzL6IsA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
6143 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_wudFBhRqEe-4k7CzzL6IsA" showIcon="false"/>
6144 <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_wudFBRRqEe-4k7CzzL6IsA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
6145 </ownedStyle>
6146 <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']"/>
6147 </ownedDiagramElements>
6148 <ownedDiagramElements xmi:type="diagram:DEdge" uid="_xrullhRqEe-4k7CzzL6IsA" sourceNode="_x-t_EF4fEe2rXNsIDUvqhw" targetNode="_wuYMgBRqEe-4k7CzzL6IsA">
6149 <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionAction"/>
6150 <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionAction"/>
6151 <ownedStyle xmi:type="diagram:EdgeStyle" uid="_xrullxRqEe-4k7CzzL6IsA" targetArrow="InputClosedArrow" routingStyle="tree">
6152 <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"/>
6153 <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_xrulmBRqEe-4k7CzzL6IsA" showIcon="false">
6154 <labelFormat>italic</labelFormat>
6155 </beginLabelStyle>
6156 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_xrulmRRqEe-4k7CzzL6IsA" showIcon="false"/>
6157 </ownedStyle>
6158 <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']"/>
6159 </ownedDiagramElements>
6026 <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> 6160 <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
6027 <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_sCFBgV4fEe2rXNsIDUvqhw"/> 6161 <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_sCFBgV4fEe2rXNsIDUvqhw"/>
6028 <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/> 6162 <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 e6af9fab..ed56d3b1 100644
--- a/subprojects/language-model/src/main/resources/model/problem.ecore
+++ b/subprojects/language-model/src/main/resources/model/problem.ecore
@@ -55,11 +55,9 @@
55 <eStructuralFeatures xsi:type="ecore:EReference" name="implicitVariables" upperBound="-1" 55 <eStructuralFeatures xsi:type="ecore:EReference" name="implicitVariables" upperBound="-1"
56 eType="#//ImplicitVariable" transient="true" containment="true"/> 56 eType="#//ImplicitVariable" transient="true" containment="true"/>
57 </eClassifiers> 57 </eClassifiers>
58 <eClassifiers xsi:type="ecore:EClass" name="Assertion" eSuperTypes="#//Statement"> 58 <eClassifiers xsi:type="ecore:EClass" name="AbstractAssertion" abstract="true">
59 <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1" 59 <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1"
60 eType="#//AssertionArgument" containment="true"/> 60 eType="#//AssertionArgument" containment="true"/>
61 <eStructuralFeatures xsi:type="ecore:EAttribute" name="default" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
62 defaultValueLiteral="false"/>
63 <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/> 61 <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/>
64 <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//Expr" 62 <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//Expr"
65 containment="true"/> 63 containment="true"/>
@@ -137,14 +135,8 @@
137 <eStructuralFeatures xsi:type="ecore:EReference" name="actions" upperBound="-1" 135 <eStructuralFeatures xsi:type="ecore:EReference" name="actions" upperBound="-1"
138 eType="#//Action" containment="true"/> 136 eType="#//Action" containment="true"/>
139 </eClassifiers> 137 </eClassifiers>
140 <eClassifiers xsi:type="ecore:EClass" name="Action" abstract="true"/> 138 <eClassifiers xsi:type="ecore:EClass" name="Action" abstract="true" interface="true"/>
141 <eClassifiers xsi:type="ecore:EClass" name="AssertionAction" eSuperTypes="#//Action"> 139 <eClassifiers xsi:type="ecore:EClass" name="AssertionAction" eSuperTypes="#//Action #//AbstractAssertion"/>
142 <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//Expr"
143 containment="true"/>
144 <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/>
145 <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1"
146 eType="#//AssertionArgument" containment="true"/>
147 </eClassifiers>
148 <eClassifiers xsi:type="ecore:EEnum" name="ComparisonOp"> 140 <eClassifiers xsi:type="ecore:EEnum" name="ComparisonOp">
149 <eLiterals name="LESS"/> 141 <eLiterals name="LESS"/>
150 <eLiterals name="LESS_EQ" value="1"/> 142 <eLiterals name="LESS_EQ" value="1"/>
@@ -282,4 +274,8 @@
282 <eLiterals name="FOCUS" value="1"/> 274 <eLiterals name="FOCUS" value="1"/>
283 <eLiterals name="MULTI" value="2"/> 275 <eLiterals name="MULTI" value="2"/>
284 </eClassifiers> 276 </eClassifiers>
277 <eClassifiers xsi:type="ecore:EClass" name="Assertion" eSuperTypes="#//Statement #//AbstractAssertion">
278 <eStructuralFeatures xsi:type="ecore:EAttribute" name="default" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
279 defaultValueLiteral="false"/>
280 </eClassifiers>
285</ecore:EPackage> 281</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 7fc9f760..c7044885 100644
--- a/subprojects/language-model/src/main/resources/model/problem.genmodel
+++ b/subprojects/language-model/src/main/resources/model/problem.genmodel
@@ -121,11 +121,10 @@
121 <genClasses ecoreClass="problem.ecore#//ExistentialQuantifier"> 121 <genClasses ecoreClass="problem.ecore#//ExistentialQuantifier">
122 <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ExistentialQuantifier/implicitVariables"/> 122 <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ExistentialQuantifier/implicitVariables"/>
123 </genClasses> 123 </genClasses>
124 <genClasses ecoreClass="problem.ecore#//Assertion"> 124 <genClasses ecoreClass="problem.ecore#//AbstractAssertion">
125 <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Assertion/arguments"/> 125 <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//AbstractAssertion/arguments"/>
126 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//Assertion/default"/> 126 <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//AbstractAssertion/relation"/>
127 <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Assertion/relation"/> 127 <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//AbstractAssertion/value"/>
128 <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Assertion/value"/>
129 </genClasses> 128 </genClasses>
130 <genClasses ecoreClass="problem.ecore#//Node"/> 129 <genClasses ecoreClass="problem.ecore#//Node"/>
131 <genClasses ecoreClass="problem.ecore#//ScopeDeclaration"> 130 <genClasses ecoreClass="problem.ecore#//ScopeDeclaration">
@@ -181,11 +180,7 @@
181 <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Consequent/actions"/> 180 <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Consequent/actions"/>
182 </genClasses> 181 </genClasses>
183 <genClasses ecoreClass="problem.ecore#//Action"/> 182 <genClasses ecoreClass="problem.ecore#//Action"/>
184 <genClasses ecoreClass="problem.ecore#//AssertionAction"> 183 <genClasses ecoreClass="problem.ecore#//AssertionAction"/>
185 <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//AssertionAction/value"/>
186 <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//AssertionAction/relation"/>
187 <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//AssertionAction/arguments"/>
188 </genClasses>
189 <genClasses ecoreClass="problem.ecore#//Expr"/> 184 <genClasses ecoreClass="problem.ecore#//Expr"/>
190 <genClasses ecoreClass="problem.ecore#//VariableOrNodeExpr"> 185 <genClasses ecoreClass="problem.ecore#//VariableOrNodeExpr">
191 <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//VariableOrNodeExpr/variableOrNode"/> 186 <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//VariableOrNodeExpr/variableOrNode"/>
@@ -251,5 +246,8 @@
251 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ModalExpr/concreteness"/> 246 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ModalExpr/concreteness"/>
252 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ModalExpr/modality"/> 247 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ModalExpr/modality"/>
253 </genClasses> 248 </genClasses>
249 <genClasses ecoreClass="problem.ecore#//Assertion">
250 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//Assertion/default"/>
251 </genClasses>
254 </genPackages> 252 </genPackages>
255</genmodel:GenModel> 253</genmodel:GenModel>
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ProblemTraceImpl.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ProblemTraceImpl.java
index aef0fd89..3a979bf0 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ProblemTraceImpl.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ProblemTraceImpl.java
@@ -152,7 +152,7 @@ class ProblemTraceImpl implements ProblemTrace {
152 152
153 @Override 153 @Override
154 public PartialRelation getPartialRelation(QualifiedName qualifiedName) { 154 public PartialRelation getPartialRelation(QualifiedName qualifiedName) {
155 var relationScope = scopeProvider.getScope(problem, ProblemPackage.Literals.ASSERTION__RELATION); 155 var relationScope = scopeProvider.getScope(problem, ProblemPackage.Literals.ABSTRACT_ASSERTION__RELATION);
156 return getPartialRelation(getElement(relationScope, qualifiedName, Relation.class)); 156 return getPartialRelation(getElement(relationScope, qualifiedName, Relation.class));
157 } 157 }
158 158
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/MetadataCreator.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/MetadataCreator.java
index 91008919..29f8ab8b 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/MetadataCreator.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/MetadataCreator.java
@@ -51,7 +51,7 @@ public class MetadataCreator {
51 this.problemTrace = problemTrace; 51 this.problemTrace = problemTrace;
52 var problem = problemTrace.getProblem(); 52 var problem = problemTrace.getProblem();
53 nodeScope = scopeProvider.getScope(problem, ProblemPackage.Literals.NODE_ASSERTION_ARGUMENT__NODE); 53 nodeScope = scopeProvider.getScope(problem, ProblemPackage.Literals.NODE_ASSERTION_ARGUMENT__NODE);
54 relationScope = scopeProvider.getScope(problem, ProblemPackage.Literals.ASSERTION__RELATION); 54 relationScope = scopeProvider.getScope(problem, ProblemPackage.Literals.ABSTRACT_ASSERTION__RELATION);
55 } 55 }
56 56
57 public List<NodeMetadata> getNodesMetadata(Model model, Concreteness concreteness) { 57 public List<NodeMetadata> getNodesMetadata(Model model, Concreteness concreteness) {
diff --git a/subprojects/language/src/main/java/tools/refinery/language/formatting2/ProblemFormatter.java b/subprojects/language/src/main/java/tools/refinery/language/formatting2/ProblemFormatter.java
index d6ece1ea..c6fca89a 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/formatting2/ProblemFormatter.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/formatting2/ProblemFormatter.java
@@ -35,7 +35,7 @@ public class ProblemFormatter extends AbstractJavaFormatter {
35 surroundNewLines(doc, assertion, this::singleNewLine); 35 surroundNewLines(doc, assertion, this::singleNewLine);
36 var region = regionFor(assertion); 36 var region = regionFor(assertion);
37 doc.append(region.feature(ProblemPackage.Literals.ASSERTION__DEFAULT), this::oneSpace); 37 doc.append(region.feature(ProblemPackage.Literals.ASSERTION__DEFAULT), this::oneSpace);
38 doc.append(region.feature(ProblemPackage.Literals.ASSERTION__RELATION), this::noSpace); 38 doc.append(region.feature(ProblemPackage.Literals.ABSTRACT_ASSERTION__RELATION), this::noSpace);
39 formatParenthesizedList(region, doc); 39 formatParenthesizedList(region, doc);
40 for (var argument : assertion.getArguments()) { 40 for (var argument : assertion.getArguments()) {
41 doc.format(argument); 41 doc.format(argument);
diff --git a/subprojects/language/src/main/java/tools/refinery/language/serializer/PreferShortAssertionsProblemSemanticSequencer.java b/subprojects/language/src/main/java/tools/refinery/language/serializer/PreferShortAssertionsProblemSemanticSequencer.java
index 3432b2d8..225bf49d 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/serializer/PreferShortAssertionsProblemSemanticSequencer.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/serializer/PreferShortAssertionsProblemSemanticSequencer.java
@@ -12,9 +12,11 @@ import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransi
12import tools.refinery.language.model.problem.Assertion; 12import tools.refinery.language.model.problem.Assertion;
13import tools.refinery.language.model.problem.LogicConstant; 13import tools.refinery.language.model.problem.LogicConstant;
14import tools.refinery.language.model.problem.LogicValue; 14import tools.refinery.language.model.problem.LogicValue;
15import tools.refinery.language.model.problem.ProblemPackage;
16import tools.refinery.language.services.ProblemGrammarAccess; 15import tools.refinery.language.services.ProblemGrammarAccess;
17 16
17import static tools.refinery.language.model.problem.ProblemPackage.Literals.ABSTRACT_ASSERTION__ARGUMENTS;
18import static tools.refinery.language.model.problem.ProblemPackage.Literals.ABSTRACT_ASSERTION__RELATION;
19
18public class PreferShortAssertionsProblemSemanticSequencer extends ProblemSemanticSequencer { 20public class PreferShortAssertionsProblemSemanticSequencer extends ProblemSemanticSequencer {
19 @Inject 21 @Inject
20 private ProblemGrammarAccess grammarAccess; 22 private ProblemGrammarAccess grammarAccess;
@@ -27,13 +29,13 @@ public class PreferShortAssertionsProblemSemanticSequencer extends ProblemSemant
27 return; 29 return;
28 } 30 }
29 if (errorAcceptor != null) { 31 if (errorAcceptor != null) {
30 if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.ASSERTION__RELATION) == ValueTransient.YES) { 32 if (transientValues.isValueTransient(semanticObject, ABSTRACT_ASSERTION__RELATION) == ValueTransient.YES) {
31 errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, 33 errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject,
32 ProblemPackage.Literals.ASSERTION__RELATION)); 34 ABSTRACT_ASSERTION__RELATION));
33 } 35 }
34 if (transientValues.isListTransient(semanticObject, ProblemPackage.Literals.ASSERTION__ARGUMENTS) == ListTransient.YES) { 36 if (transientValues.isListTransient(semanticObject, ABSTRACT_ASSERTION__ARGUMENTS) == ListTransient.YES) {
35 errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, 37 errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject,
36 ProblemPackage.Literals.ASSERTION__ARGUMENTS)); 38 ABSTRACT_ASSERTION__ARGUMENTS));
37 } 39 }
38 } 40 }
39 var feeder = createSequencerFeeder(context, semanticObject); 41 var feeder = createSequencerFeeder(context, semanticObject);
diff --git a/subprojects/language/src/main/java/tools/refinery/language/typesystem/TypedModule.java b/subprojects/language/src/main/java/tools/refinery/language/typesystem/TypedModule.java
index 0b252c09..63815506 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/typesystem/TypedModule.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/typesystem/TypedModule.java
@@ -8,7 +8,6 @@ package tools.refinery.language.typesystem;
8import com.google.inject.Inject; 8import com.google.inject.Inject;
9import org.eclipse.emf.common.util.Diagnostic; 9import org.eclipse.emf.common.util.Diagnostic;
10import org.eclipse.emf.ecore.EObject; 10import org.eclipse.emf.ecore.EObject;
11import org.eclipse.emf.ecore.EReference;
12import org.eclipse.emf.ecore.EStructuralFeature; 11import org.eclipse.emf.ecore.EStructuralFeature;
13import org.eclipse.xtext.validation.CheckType; 12import org.eclipse.xtext.validation.CheckType;
14import org.eclipse.xtext.validation.FeatureBasedDiagnostic; 13import org.eclipse.xtext.validation.FeatureBasedDiagnostic;
@@ -97,17 +96,17 @@ public class TypedModule {
97 } 96 }
98 97
99 private void checkTypes(Assertion assertion) { 98 private void checkTypes(Assertion assertion) {
100 var relation = assertion.getRelation(); 99 checkAssertionValueType(assertion);
101 var value = assertion.getValue(); 100 checkNodeAssertionArgumentTypes(assertion, false);
102 checkAssertion(assertion, relation, value, ProblemPackage.Literals.ASSERTION__RELATION);
103 checkNodeAssertionArgumentTypes(assertion.getArguments(), false);
104 } 101 }
105 102
106 private void checkAssertion(EObject assertion, Relation relation, Expr value, EReference relationReference) { 103 private void checkAssertionValueType(AbstractAssertion assertion) {
104 var relation = assertion.getRelation();
107 if (relation == null) { 105 if (relation == null) {
108 return; 106 return;
109 } 107 }
110 var type = signatureProvider.getSignature(relation).resultType(); 108 var type = signatureProvider.getSignature(relation).resultType();
109 var value = assertion.getValue();
111 if (type == ExprType.LITERAL) { 110 if (type == ExprType.LITERAL) {
112 if (value == null) { 111 if (value == null) {
113 return; 112 return;
@@ -117,14 +116,14 @@ public class TypedModule {
117 } 116 }
118 if (value == null) { 117 if (value == null) {
119 var message = "Assertion value of type %s is required.".formatted(type); 118 var message = "Assertion value of type %s is required.".formatted(type);
120 error(message, assertion, relationReference, 0, ProblemValidator.TYPE_ERROR); 119 error(message, assertion, ProblemPackage.Literals.ABSTRACT_ASSERTION__VALUE, 0,
120 ProblemValidator.TYPE_ERROR);
121 } 121 }
122 expectType(value, type); 122 expectType(value, type);
123 } 123 }
124 124
125 private void checkNodeAssertionArgumentTypes(Collection<AssertionArgument> assertionArguments, 125 private void checkNodeAssertionArgumentTypes(AbstractAssertion assertion, boolean allowVariables) {
126 boolean allowVariables) { 126 for (var argument : assertion.getArguments()) {
127 for (var argument : assertionArguments) {
128 if (argument instanceof NodeAssertionArgument nodeAssertionArgument) { 127 if (argument instanceof NodeAssertionArgument nodeAssertionArgument) {
129 checkNodeAssertionArgumentType(nodeAssertionArgument, allowVariables); 128 checkNodeAssertionArgumentType(nodeAssertionArgument, allowVariables);
130 } 129 }
@@ -150,10 +149,8 @@ public class TypedModule {
150 } 149 }
151 150
152 private void checkTypes(AssertionAction assertionAction) { 151 private void checkTypes(AssertionAction assertionAction) {
153 var relation = assertionAction.getRelation(); 152 checkAssertionValueType(assertionAction);
154 var value = assertionAction.getValue(); 153 checkNodeAssertionArgumentTypes(assertionAction, true);
155 checkAssertion(assertionAction, relation, value, ProblemPackage.Literals.ASSERTION_ACTION__RELATION);
156 checkNodeAssertionArgumentTypes(assertionAction.getArguments(), true);
157 } 154 }
158 155
159 public List<FeatureBasedDiagnostic> getDiagnostics() { 156 public List<FeatureBasedDiagnostic> getDiagnostics() {
diff --git a/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java b/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java
index 7046d4c6..0285c0c8 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java
@@ -382,16 +382,16 @@ public class ProblemValidator extends AbstractProblemValidator {
382 } 382 }
383 383
384 @Check 384 @Check
385 public void checkAssertion(Assertion assertion) { 385 public void checkAssertion(AbstractAssertion assertion) {
386 var relation = assertion.getRelation(); 386 var relation = assertion.getRelation();
387 if (relation instanceof DatatypeDeclaration) { 387 if (relation instanceof DatatypeDeclaration) {
388 var message = "Assertions for data types are not supported."; 388 var message = "Assertions for data types are not supported.";
389 acceptError(message, assertion, ProblemPackage.Literals.ASSERTION__RELATION, 0, 389 acceptError(message, assertion, ProblemPackage.Literals.ABSTRACT_ASSERTION__RELATION, 0,
390 UNSUPPORTED_ASSERTION_ISSUE); 390 UNSUPPORTED_ASSERTION_ISSUE);
391 return; 391 return;
392 } 392 }
393 int argumentCount = assertion.getArguments().size(); 393 int argumentCount = assertion.getArguments().size();
394 checkArity(assertion, ProblemPackage.Literals.ASSERTION__RELATION, argumentCount); 394 checkArity(assertion, ProblemPackage.Literals.ABSTRACT_ASSERTION__RELATION, argumentCount);
395 } 395 }
396 396
397 @Check 397 @Check
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-01 09:09:30 +0000