diff options
author | OszkarSemerath <oszka@SEMERATH-LAPTOP> | 2017-08-08 16:11:45 +0200 |
---|---|---|
committer | OszkarSemerath <oszka@SEMERATH-LAPTOP> | 2017-08-08 16:11:45 +0200 |
commit | 30c205f552a9c66c69903d4f12dd09f3e27e06ea (patch) | |
tree | b61a9a692220b7fe25f8aaa54d5cdcc70b024254 /Framework | |
parent | added String to the logic problem, and representations returns the set (diff) | |
download | VIATRA-Generator-30c205f552a9c66c69903d4f12dd09f3e27e06ea.tar.gz VIATRA-Generator-30c205f552a9c66c69903d4f12dd09f3e27e06ea.tar.zst VIATRA-Generator-30c205f552a9c66c69903d4f12dd09f3e27e06ea.zip |
Support for double and string attributes
Diffstat (limited to 'Framework')
4 files changed, 167 insertions, 56 deletions
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.aird b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.aird index 4c0c5b13..16247fdd 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.aird +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.aird | |||
@@ -7273,6 +7273,12 @@ | |||
7273 | <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> | 7273 | <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> |
7274 | </endLabelStyleDescription> | 7274 | </endLabelStyleDescription> |
7275 | </computedStyleDescriptions> | 7275 | </computedStyleDescriptions> |
7276 | <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_fCSyIHuWEeeCn_RNMwgEBg" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1"> | ||
7277 | <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> | ||
7278 | <labelFormat>bold</labelFormat> | ||
7279 | <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> | ||
7280 | <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> | ||
7281 | </computedStyleDescriptions> | ||
7276 | </data> | 7282 | </data> |
7277 | </ownedAnnotationEntries> | 7283 | </ownedAnnotationEntries> |
7278 | <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_l6XRjbdnEeau1vMV3Bsx4w" source="GMF_DIAGRAMS"> | 7284 | <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_l6XRjbdnEeau1vMV3Bsx4w" source="GMF_DIAGRAMS"> |
@@ -7289,6 +7295,10 @@ | |||
7289 | <children xmi:type="notation:Node" xmi:id="_l6XR7LdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIH7dnEeau1vMV3Bsx4w"> | 7295 | <children xmi:type="notation:Node" xmi:id="_l6XR7LdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIH7dnEeau1vMV3Bsx4w"> |
7290 | <children xmi:type="notation:Node" xmi:id="_l6XR7bdnEeau1vMV3Bsx4w" type="5007"/> | 7296 | <children xmi:type="notation:Node" xmi:id="_l6XR7bdnEeau1vMV3Bsx4w" type="5007"/> |
7291 | <children xmi:type="notation:Node" xmi:id="_l6XR7rdnEeau1vMV3Bsx4w" type="7004"> | 7297 | <children xmi:type="notation:Node" xmi:id="_l6XR7rdnEeau1vMV3Bsx4w" type="7004"> |
7298 | <children xmi:type="notation:Node" xmi:id="_SzhvMHuWEeeCn_RNMwgEBg" type="3010" element="_SyqzkHuWEeeCn_RNMwgEBg"> | ||
7299 | <styles xmi:type="notation:FontStyle" xmi:id="_SzhvMXuWEeeCn_RNMwgEBg" fontName="Segoe UI" fontHeight="8"/> | ||
7300 | <layoutConstraint xmi:type="notation:Location" xmi:id="_SzhvMnuWEeeCn_RNMwgEBg"/> | ||
7301 | </children> | ||
7292 | <styles xmi:type="notation:SortingStyle" xmi:id="_l6XR77dnEeau1vMV3Bsx4w"/> | 7302 | <styles xmi:type="notation:SortingStyle" xmi:id="_l6XR77dnEeau1vMV3Bsx4w"/> |
7293 | <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XR8LdnEeau1vMV3Bsx4w"/> | 7303 | <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XR8LdnEeau1vMV3Bsx4w"/> |
7294 | </children> | 7304 | </children> |
@@ -7315,7 +7325,7 @@ | |||
7315 | <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSAbdnEeau1vMV3Bsx4w"/> | 7325 | <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSAbdnEeau1vMV3Bsx4w"/> |
7316 | </children> | 7326 | </children> |
7317 | <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSArdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/> | 7327 | <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSArdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/> |
7318 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSA7dnEeau1vMV3Bsx4w" x="1165" y="455"/> | 7328 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSA7dnEeau1vMV3Bsx4w" x="1165" y="455" height="53"/> |
7319 | </children> | 7329 | </children> |
7320 | <children xmi:type="notation:Node" xmi:id="_l6XSBLdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIJ7dnEeau1vMV3Bsx4w"> | 7330 | <children xmi:type="notation:Node" xmi:id="_l6XSBLdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIJ7dnEeau1vMV3Bsx4w"> |
7321 | <children xmi:type="notation:Node" xmi:id="_l6XSBbdnEeau1vMV3Bsx4w" type="5007"/> | 7331 | <children xmi:type="notation:Node" xmi:id="_l6XSBbdnEeau1vMV3Bsx4w" type="5007"/> |
@@ -7328,7 +7338,7 @@ | |||
7328 | <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSC7dnEeau1vMV3Bsx4w"/> | 7338 | <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSC7dnEeau1vMV3Bsx4w"/> |
7329 | </children> | 7339 | </children> |
7330 | <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSDLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/> | 7340 | <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSDLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/> |
7331 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSDbdnEeau1vMV3Bsx4w" x="981" y="460"/> | 7341 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSDbdnEeau1vMV3Bsx4w" x="981" y="460" height="53"/> |
7332 | </children> | 7342 | </children> |
7333 | <children xmi:type="notation:Node" xmi:id="_l6XSDrdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIK7dnEeau1vMV3Bsx4w"> | 7343 | <children xmi:type="notation:Node" xmi:id="_l6XSDrdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIK7dnEeau1vMV3Bsx4w"> |
7334 | <children xmi:type="notation:Node" xmi:id="_l6XSD7dnEeau1vMV3Bsx4w" type="5007"/> | 7344 | <children xmi:type="notation:Node" xmi:id="_l6XSD7dnEeau1vMV3Bsx4w" type="5007"/> |
@@ -7341,7 +7351,7 @@ | |||
7341 | <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSFbdnEeau1vMV3Bsx4w"/> | 7351 | <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSFbdnEeau1vMV3Bsx4w"/> |
7342 | </children> | 7352 | </children> |
7343 | <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSFrdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/> | 7353 | <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSFrdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/> |
7344 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSF7dnEeau1vMV3Bsx4w" x="835" y="454"/> | 7354 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSF7dnEeau1vMV3Bsx4w" x="835" y="454" height="53"/> |
7345 | </children> | 7355 | </children> |
7346 | <children xmi:type="notation:Node" xmi:id="_l6XSGLdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIL7dnEeau1vMV3Bsx4w"> | 7356 | <children xmi:type="notation:Node" xmi:id="_l6XSGLdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIL7dnEeau1vMV3Bsx4w"> |
7347 | <children xmi:type="notation:Node" xmi:id="_l6XSGbdnEeau1vMV3Bsx4w" type="5007"/> | 7357 | <children xmi:type="notation:Node" xmi:id="_l6XSGbdnEeau1vMV3Bsx4w" type="5007"/> |
@@ -7404,7 +7414,7 @@ | |||
7404 | <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSRrdnEeau1vMV3Bsx4w"/> | 7414 | <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSRrdnEeau1vMV3Bsx4w"/> |
7405 | </children> | 7415 | </children> |
7406 | <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSR7dnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/> | 7416 | <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSR7dnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/> |
7407 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSSLdnEeau1vMV3Bsx4w" x="-460" y="650"/> | 7417 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSSLdnEeau1vMV3Bsx4w" x="-460" y="650" height="44"/> |
7408 | </children> | 7418 | </children> |
7409 | <children xmi:type="notation:Node" xmi:id="_l6XSSbdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIPbdnEeau1vMV3Bsx4w"> | 7419 | <children xmi:type="notation:Node" xmi:id="_l6XSSbdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIPbdnEeau1vMV3Bsx4w"> |
7410 | <children xmi:type="notation:Node" xmi:id="_l6XSSrdnEeau1vMV3Bsx4w" type="5007"/> | 7420 | <children xmi:type="notation:Node" xmi:id="_l6XSSrdnEeau1vMV3Bsx4w" type="5007"/> |
@@ -7422,7 +7432,7 @@ | |||
7422 | <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSVLdnEeau1vMV3Bsx4w"/> | 7432 | <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSVLdnEeau1vMV3Bsx4w"/> |
7423 | </children> | 7433 | </children> |
7424 | <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSVbdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/> | 7434 | <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSVbdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/> |
7425 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSVrdnEeau1vMV3Bsx4w" x="-610" y="650"/> | 7435 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSVrdnEeau1vMV3Bsx4w" x="-610" y="650" height="44"/> |
7426 | </children> | 7436 | </children> |
7427 | <children xmi:type="notation:Node" xmi:id="_l6XSV7dnEeau1vMV3Bsx4w" type="2003" element="_l6ZIQbdnEeau1vMV3Bsx4w"> | 7437 | <children xmi:type="notation:Node" xmi:id="_l6XSV7dnEeau1vMV3Bsx4w" type="2003" element="_l6ZIQbdnEeau1vMV3Bsx4w"> |
7428 | <children xmi:type="notation:Node" xmi:id="_l6XSWLdnEeau1vMV3Bsx4w" type="5007"/> | 7438 | <children xmi:type="notation:Node" xmi:id="_l6XSWLdnEeau1vMV3Bsx4w" type="5007"/> |
@@ -7431,7 +7441,7 @@ | |||
7431 | <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSW7dnEeau1vMV3Bsx4w"/> | 7441 | <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSW7dnEeau1vMV3Bsx4w"/> |
7432 | </children> | 7442 | </children> |
7433 | <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSXLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/> | 7443 | <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSXLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/> |
7434 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSXbdnEeau1vMV3Bsx4w" x="-280" y="650"/> | 7444 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSXbdnEeau1vMV3Bsx4w" x="-280" y="650" height="44"/> |
7435 | </children> | 7445 | </children> |
7436 | <children xmi:type="notation:Node" xmi:id="_l6XSXrdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIQ7dnEeau1vMV3Bsx4w"> | 7446 | <children xmi:type="notation:Node" xmi:id="_l6XSXrdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIQ7dnEeau1vMV3Bsx4w"> |
7437 | <children xmi:type="notation:Node" xmi:id="_l6XSX7dnEeau1vMV3Bsx4w" type="5007"/> | 7447 | <children xmi:type="notation:Node" xmi:id="_l6XSX7dnEeau1vMV3Bsx4w" type="5007"/> |
@@ -7595,6 +7605,19 @@ | |||
7595 | <styles xmi:type="notation:ShapeStyle" xmi:id="_JfwFgbd8Eeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8" italic="true"/> | 7605 | <styles xmi:type="notation:ShapeStyle" xmi:id="_JfwFgbd8Eeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8" italic="true"/> |
7596 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JfwFgrd8Eeau1vMV3Bsx4w" x="1845" y="585"/> | 7606 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JfwFgrd8Eeau1vMV3Bsx4w" x="1845" y="585"/> |
7597 | </children> | 7607 | </children> |
7608 | <children xmi:type="notation:Node" xmi:id="_Xh-bUHuWEeeCn_RNMwgEBg" type="2003" element="_XgmiUHuWEeeCn_RNMwgEBg"> | ||
7609 | <children xmi:type="notation:Node" xmi:id="_Xh_CYHuWEeeCn_RNMwgEBg" type="5007"/> | ||
7610 | <children xmi:type="notation:Node" xmi:id="_Xh_pcHuWEeeCn_RNMwgEBg" type="7004"> | ||
7611 | <children xmi:type="notation:Node" xmi:id="_bt_IwHuWEeeCn_RNMwgEBg" type="3010" element="_bsTGsHuWEeeCn_RNMwgEBg"> | ||
7612 | <styles xmi:type="notation:FontStyle" xmi:id="_bt_IwXuWEeeCn_RNMwgEBg" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/> | ||
7613 | <layoutConstraint xmi:type="notation:Location" xmi:id="_bt_IwnuWEeeCn_RNMwgEBg"/> | ||
7614 | </children> | ||
7615 | <styles xmi:type="notation:SortingStyle" xmi:id="_Xh_pcXuWEeeCn_RNMwgEBg"/> | ||
7616 | <styles xmi:type="notation:FilteringStyle" xmi:id="_Xh_pcnuWEeeCn_RNMwgEBg"/> | ||
7617 | </children> | ||
7618 | <styles xmi:type="notation:ShapeStyle" xmi:id="_Xh-bUXuWEeeCn_RNMwgEBg" fontName="Segoe UI" fontHeight="8"/> | ||
7619 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xh-bUnuWEeeCn_RNMwgEBg" x="1085" y="519" width="120" height="54"/> | ||
7620 | </children> | ||
7598 | <styles xmi:type="notation:DiagramStyle" xmi:id="_l6X5OrdnEeau1vMV3Bsx4w"/> | 7621 | <styles xmi:type="notation:DiagramStyle" xmi:id="_l6X5OrdnEeau1vMV3Bsx4w"/> |
7599 | <edges xmi:type="notation:Edge" xmi:id="_l6X5a7dnEeau1vMV3Bsx4w" type="4001" element="_l6Zt6bdnEeau1vMV3Bsx4w" source="_l6XR7LdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w"> | 7622 | <edges xmi:type="notation:Edge" xmi:id="_l6X5a7dnEeau1vMV3Bsx4w" type="4001" element="_l6Zt6bdnEeau1vMV3Bsx4w" source="_l6XR7LdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w"> |
7600 | <children xmi:type="notation:Node" xmi:id="_l6X5bLdnEeau1vMV3Bsx4w" type="6001"> | 7623 | <children xmi:type="notation:Node" xmi:id="_l6X5bLdnEeau1vMV3Bsx4w" type="6001"> |
@@ -8556,6 +8579,38 @@ | |||
8556 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bo5d8LqxEeau1vMV3Bsx4w" id="(0.5,0.0)"/> | 8579 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bo5d8LqxEeau1vMV3Bsx4w" id="(0.5,0.0)"/> |
8557 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bo5d8bqxEeau1vMV3Bsx4w" id="(0.5,1.0)"/> | 8580 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bo5d8bqxEeau1vMV3Bsx4w" id="(0.5,1.0)"/> |
8558 | </edges> | 8581 | </edges> |
8582 | <edges xmi:type="notation:Edge" xmi:id="_SzmAoHuWEeeCn_RNMwgEBg" type="4001" element="_SzZzYHuWEeeCn_RNMwgEBg" source="_l6XSGLdnEeau1vMV3Bsx4w" target="_l6X43LdnEeau1vMV3Bsx4w"> | ||
8583 | <children xmi:type="notation:Node" xmi:id="_SzmApHuWEeeCn_RNMwgEBg" type="6001"> | ||
8584 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SzmApXuWEeeCn_RNMwgEBg" y="-10"/> | ||
8585 | </children> | ||
8586 | <children xmi:type="notation:Node" xmi:id="_SzmnsHuWEeeCn_RNMwgEBg" type="6002"> | ||
8587 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SzmnsXuWEeeCn_RNMwgEBg" y="10"/> | ||
8588 | </children> | ||
8589 | <children xmi:type="notation:Node" xmi:id="_SzmnsnuWEeeCn_RNMwgEBg" type="6003"> | ||
8590 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Szmns3uWEeeCn_RNMwgEBg" y="10"/> | ||
8591 | </children> | ||
8592 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_SzmAoXuWEeeCn_RNMwgEBg" routing="Tree"/> | ||
8593 | <styles xmi:type="notation:FontStyle" xmi:id="_SzmAonuWEeeCn_RNMwgEBg" fontName="Segoe UI" fontHeight="8"/> | ||
8594 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SzmAo3uWEeeCn_RNMwgEBg" points="[1760, 440, 1760, 440]$[2855, -1, 2855, -1]"/> | ||
8595 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SznOwHuWEeeCn_RNMwgEBg" id="(0.5,0.5)"/> | ||
8596 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SznOwXuWEeeCn_RNMwgEBg" id="(0.5,1.0)"/> | ||
8597 | </edges> | ||
8598 | <edges xmi:type="notation:Edge" xmi:id="_zFvSUHuWEeeCn_RNMwgEBg" type="4001" element="_zEk0sHuWEeeCn_RNMwgEBg" source="_Xh-bUHuWEeeCn_RNMwgEBg" target="_l6XR87dnEeau1vMV3Bsx4w"> | ||
8599 | <children xmi:type="notation:Node" xmi:id="_zFv5YHuWEeeCn_RNMwgEBg" type="6001"> | ||
8600 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zFv5YXuWEeeCn_RNMwgEBg" y="-10"/> | ||
8601 | </children> | ||
8602 | <children xmi:type="notation:Node" xmi:id="_zFv5YnuWEeeCn_RNMwgEBg" type="6002"> | ||
8603 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zFv5Y3uWEeeCn_RNMwgEBg" y="10"/> | ||
8604 | </children> | ||
8605 | <children xmi:type="notation:Node" xmi:id="_zFwgcHuWEeeCn_RNMwgEBg" type="6003"> | ||
8606 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zFwgcXuWEeeCn_RNMwgEBg" y="10"/> | ||
8607 | </children> | ||
8608 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_zFvSUXuWEeeCn_RNMwgEBg" routing="Tree"/> | ||
8609 | <styles xmi:type="notation:FontStyle" xmi:id="_zFvSUnuWEeeCn_RNMwgEBg" fontName="Segoe UI" fontHeight="8"/> | ||
8610 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zFvSU3uWEeeCn_RNMwgEBg" points="[0, 0, 202, 250]$[-202, -250, 0, 0]"/> | ||
8611 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zFwgcnuWEeeCn_RNMwgEBg" id="(0.5932203389830508,0.0)"/> | ||
8612 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zFwgc3uWEeeCn_RNMwgEBg" id="(0.5,1.0)"/> | ||
8613 | </edges> | ||
8559 | </data> | 8614 | </data> |
8560 | </ownedAnnotationEntries> | 8615 | </ownedAnnotationEntries> |
8561 | <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIGbdnEeau1vMV3Bsx4w" name="Term" tooltipText="" outgoingEdges="_l6ZufbdnEeau1vMV3Bsx4w" incomingEdges="_l6Zt6bdnEeau1vMV3Bsx4w _l6Zt9bdnEeau1vMV3Bsx4w _l6Zt-bdnEeau1vMV3Bsx4w _l6Zt_bdnEeau1vMV3Bsx4w _l6ZuAbdnEeau1vMV3Bsx4w _l6ZuBbdnEeau1vMV3Bsx4w _l6ZuCbdnEeau1vMV3Bsx4w _l6ZuDbdnEeau1vMV3Bsx4w _l6ZuEbdnEeau1vMV3Bsx4w _l6ZuFbdnEeau1vMV3Bsx4w _l6ZuGbdnEeau1vMV3Bsx4w _l6ZuHbdnEeau1vMV3Bsx4w _l6ZuIbdnEeau1vMV3Bsx4w _l6ZuJbdnEeau1vMV3Bsx4w _l6ZuKbdnEeau1vMV3Bsx4w _l6ZuLbdnEeau1vMV3Bsx4w _l6ZuMbdnEeau1vMV3Bsx4w _l6ZuNbdnEeau1vMV3Bsx4w _l6ZuObdnEeau1vMV3Bsx4w _l6ZuPbdnEeau1vMV3Bsx4w _l6ZuQbdnEeau1vMV3Bsx4w _l6ZuRbdnEeau1vMV3Bsx4w _l6ZuhbdnEeau1vMV3Bsx4w _l6ZuibdnEeau1vMV3Bsx4w _l6ZunbdnEeau1vMV3Bsx4w _l6ZuqbdnEeau1vMV3Bsx4w _l6ZuwbdnEeau1vMV3Bsx4w _l6Zu3bdnEeau1vMV3Bsx4w _l6ZvHbdnEeau1vMV3Bsx4w _l6ZvIbdnEeau1vMV3Bsx4w _l6ZvJbdnEeau1vMV3Bsx4w _l6ZvKbdnEeau1vMV3Bsx4w _l6ZvZ7dnEeau1vMV3Bsx4w _kQZhsLd1Eeau1vMV3Bsx4w _BoaVwLqxEeau1vMV3Bsx4w" width="12" height="10"> | 8616 | <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIGbdnEeau1vMV3Bsx4w" name="Term" tooltipText="" outgoingEdges="_l6ZufbdnEeau1vMV3Bsx4w" incomingEdges="_l6Zt6bdnEeau1vMV3Bsx4w _l6Zt9bdnEeau1vMV3Bsx4w _l6Zt-bdnEeau1vMV3Bsx4w _l6Zt_bdnEeau1vMV3Bsx4w _l6ZuAbdnEeau1vMV3Bsx4w _l6ZuBbdnEeau1vMV3Bsx4w _l6ZuCbdnEeau1vMV3Bsx4w _l6ZuDbdnEeau1vMV3Bsx4w _l6ZuEbdnEeau1vMV3Bsx4w _l6ZuFbdnEeau1vMV3Bsx4w _l6ZuGbdnEeau1vMV3Bsx4w _l6ZuHbdnEeau1vMV3Bsx4w _l6ZuIbdnEeau1vMV3Bsx4w _l6ZuJbdnEeau1vMV3Bsx4w _l6ZuKbdnEeau1vMV3Bsx4w _l6ZuLbdnEeau1vMV3Bsx4w _l6ZuMbdnEeau1vMV3Bsx4w _l6ZuNbdnEeau1vMV3Bsx4w _l6ZuObdnEeau1vMV3Bsx4w _l6ZuPbdnEeau1vMV3Bsx4w _l6ZuQbdnEeau1vMV3Bsx4w _l6ZuRbdnEeau1vMV3Bsx4w _l6ZuhbdnEeau1vMV3Bsx4w _l6ZuibdnEeau1vMV3Bsx4w _l6ZunbdnEeau1vMV3Bsx4w _l6ZuqbdnEeau1vMV3Bsx4w _l6ZuwbdnEeau1vMV3Bsx4w _l6Zu3bdnEeau1vMV3Bsx4w _l6ZvHbdnEeau1vMV3Bsx4w _l6ZvIbdnEeau1vMV3Bsx4w _l6ZvJbdnEeau1vMV3Bsx4w _l6ZvKbdnEeau1vMV3Bsx4w _l6ZvZ7dnEeau1vMV3Bsx4w _kQZhsLd1Eeau1vMV3Bsx4w _BoaVwLqxEeau1vMV3Bsx4w" width="12" height="10"> |
@@ -8577,8 +8632,16 @@ | |||
8577 | <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"/> | 8632 | <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"/> |
8578 | </ownedStyle> | 8633 | </ownedStyle> |
8579 | <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']"/> | 8634 | <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']"/> |
8635 | <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_SyqzkHuWEeeCn_RNMwgEBg" name=" symbolicReference : SymbolicDeclaration" tooltipText=""> | ||
8636 | <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//SymbolicValue/symbolicReference"/> | ||
8637 | <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//SymbolicValue/symbolicReference"/> | ||
8638 | <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SysowHuWEeeCn_RNMwgEBg" labelAlignment="LEFT" color="114,159,207"> | ||
8639 | <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"/> | ||
8640 | </ownedStyle> | ||
8641 | <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']"/> | ||
8642 | </ownedElements> | ||
8580 | </ownedDiagramElements> | 8643 | </ownedDiagramElements> |
8581 | <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIIbdnEeau1vMV3Bsx4w" name="AtomicTerm" tooltipText="" outgoingEdges="_l6ZuibdnEeau1vMV3Bsx4w" incomingEdges="_l6ZujbdnEeau1vMV3Bsx4w _l6ZukbdnEeau1vMV3Bsx4w _l6ZulbdnEeau1vMV3Bsx4w" width="12" height="10"> | 8644 | <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIIbdnEeau1vMV3Bsx4w" name="AtomicTerm" tooltipText="" outgoingEdges="_l6ZuibdnEeau1vMV3Bsx4w" incomingEdges="_l6ZujbdnEeau1vMV3Bsx4w _l6ZukbdnEeau1vMV3Bsx4w _l6ZulbdnEeau1vMV3Bsx4w _zEk0sHuWEeeCn_RNMwgEBg" width="12" height="10"> |
8582 | <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//AtomicTerm"/> | 8645 | <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//AtomicTerm"/> |
8583 | <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//AtomicTerm"/> | 8646 | <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//AtomicTerm"/> |
8584 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | 8647 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> |
@@ -8600,8 +8663,8 @@ | |||
8600 | <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_l6ZIJbdnEeau1vMV3Bsx4w" name="value : EInt" tooltipText=""> | 8663 | <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_l6ZIJbdnEeau1vMV3Bsx4w" name="value : EInt" tooltipText=""> |
8601 | <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//IntLiteral/value"/> | 8664 | <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//IntLiteral/value"/> |
8602 | <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//IntLiteral/value"/> | 8665 | <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//IntLiteral/value"/> |
8603 | <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_l6ZIJrdnEeau1vMV3Bsx4w" labelAlignment="LEFT"> | 8666 | <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_geTdIHuWEeeCn_RNMwgEBg" labelAlignment="LEFT" description="_fCSyIHuWEeeCn_RNMwgEBg"> |
8604 | <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"/> | 8667 | <labelFormat>bold</labelFormat> |
8605 | </ownedStyle> | 8668 | </ownedStyle> |
8606 | <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']"/> | 8669 | <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']"/> |
8607 | </ownedElements> | 8670 | </ownedElements> |
@@ -8619,8 +8682,8 @@ | |||
8619 | <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_l6ZIKbdnEeau1vMV3Bsx4w" name="value : EBoolean = false" tooltipText=""> | 8682 | <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_l6ZIKbdnEeau1vMV3Bsx4w" name="value : EBoolean = false" tooltipText=""> |
8620 | <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//BoolLiteral/value"/> | 8683 | <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//BoolLiteral/value"/> |
8621 | <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//BoolLiteral/value"/> | 8684 | <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//BoolLiteral/value"/> |
8622 | <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_l6ZIKrdnEeau1vMV3Bsx4w" labelAlignment="LEFT"> | 8685 | <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_g7P30HuWEeeCn_RNMwgEBg" labelAlignment="LEFT" description="_fCSyIHuWEeeCn_RNMwgEBg"> |
8623 | <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"/> | 8686 | <labelFormat>bold</labelFormat> |
8624 | </ownedStyle> | 8687 | </ownedStyle> |
8625 | <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']"/> | 8688 | <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']"/> |
8626 | </ownedElements> | 8689 | </ownedElements> |
@@ -8638,13 +8701,13 @@ | |||
8638 | <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_l6ZILbdnEeau1vMV3Bsx4w" name="value : EBigDecimal" tooltipText=""> | 8701 | <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_l6ZILbdnEeau1vMV3Bsx4w" name="value : EBigDecimal" tooltipText=""> |
8639 | <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//RealLiteral/value"/> | 8702 | <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//RealLiteral/value"/> |
8640 | <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//RealLiteral/value"/> | 8703 | <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//RealLiteral/value"/> |
8641 | <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_l6ZILrdnEeau1vMV3Bsx4w" labelAlignment="LEFT"> | 8704 | <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_hXV98HuWEeeCn_RNMwgEBg" labelAlignment="LEFT" description="_fCSyIHuWEeeCn_RNMwgEBg"> |
8642 | <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"/> | 8705 | <labelFormat>bold</labelFormat> |
8643 | </ownedStyle> | 8706 | </ownedStyle> |
8644 | <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']"/> | 8707 | <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']"/> |
8645 | </ownedElements> | 8708 | </ownedElements> |
8646 | </ownedDiagramElements> | 8709 | </ownedDiagramElements> |
8647 | <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIL7dnEeau1vMV3Bsx4w" name="Variable" tooltipText="" outgoingEdges="_JfkfULd8Eeau1vMV3Bsx4w" incomingEdges="_l6Zt8bdnEeau1vMV3Bsx4w" width="12" height="10"> | 8710 | <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIL7dnEeau1vMV3Bsx4w" name="Variable" tooltipText="" outgoingEdges="_JfkfULd8Eeau1vMV3Bsx4w _SzZzYHuWEeeCn_RNMwgEBg" incomingEdges="_l6Zt8bdnEeau1vMV3Bsx4w" width="12" height="10"> |
8648 | <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/> | 8711 | <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/> |
8649 | <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/> | 8712 | <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/> |
8650 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | 8713 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> |
@@ -8883,7 +8946,7 @@ | |||
8883 | </ownedStyle> | 8946 | </ownedStyle> |
8884 | <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']"/> | 8947 | <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']"/> |
8885 | </ownedDiagramElements> | 8948 | </ownedDiagramElements> |
8886 | <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6Ztz7dnEeau1vMV3Bsx4w" name="TermDescription" tooltipText="" incomingEdges="_l6ZufbdnEeau1vMV3Bsx4w" width="12" height="10"> | 8949 | <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6Ztz7dnEeau1vMV3Bsx4w" name="TermDescription" tooltipText="" incomingEdges="_l6ZufbdnEeau1vMV3Bsx4w _SzZzYHuWEeeCn_RNMwgEBg" width="12" height="10"> |
8887 | <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TermDescription"/> | 8950 | <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TermDescription"/> |
8888 | <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TermDescription"/> | 8951 | <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TermDescription"/> |
8889 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | 8952 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> |
@@ -9680,6 +9743,49 @@ | |||
9680 | </ownedStyle> | 9743 | </ownedStyle> |
9681 | <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']"/> | 9744 | <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']"/> |
9682 | </ownedDiagramElements> | 9745 | </ownedDiagramElements> |
9746 | <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_SzZzYHuWEeeCn_RNMwgEBg" sourceNode="_l6ZIL7dnEeau1vMV3Bsx4w" targetNode="_l6Ztz7dnEeau1vMV3Bsx4w"> | ||
9747 | <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/> | ||
9748 | <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Variable/@eGenericSuperTypes.0"/> | ||
9749 | <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_SzaacHuWEeeCn_RNMwgEBg" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree"> | ||
9750 | <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"/> | ||
9751 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_SzaacXuWEeeCn_RNMwgEBg" showIcon="false"> | ||
9752 | <labelFormat>italic</labelFormat> | ||
9753 | </beginLabelStyle> | ||
9754 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_SzaacnuWEeeCn_RNMwgEBg" showIcon="false"/> | ||
9755 | </ownedStyle> | ||
9756 | <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']"/> | ||
9757 | </ownedDiagramElements> | ||
9758 | <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_XgmiUHuWEeeCn_RNMwgEBg" name="StringLiteral" tooltipText="" outgoingEdges="_zEk0sHuWEeeCn_RNMwgEBg" width="12" height="10"> | ||
9759 | <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//StringLiteral"/> | ||
9760 | <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//StringLiteral"/> | ||
9761 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | ||
9762 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | ||
9763 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | ||
9764 | <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_fCIaEHuWEeeCn_RNMwgEBg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> | ||
9765 | <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"/> | ||
9766 | </ownedStyle> | ||
9767 | <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']"/> | ||
9768 | <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_bsTGsHuWEeeCn_RNMwgEBg" name="value : EString" tooltipText=""> | ||
9769 | <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//StringLiteral/value"/> | ||
9770 | <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//StringLiteral/value"/> | ||
9771 | <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fCTZMHuWEeeCn_RNMwgEBg" labelAlignment="LEFT" description="_fCSyIHuWEeeCn_RNMwgEBg"> | ||
9772 | <labelFormat>bold</labelFormat> | ||
9773 | </ownedStyle> | ||
9774 | <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']"/> | ||
9775 | </ownedElements> | ||
9776 | </ownedDiagramElements> | ||
9777 | <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_zEk0sHuWEeeCn_RNMwgEBg" sourceNode="_XgmiUHuWEeeCn_RNMwgEBg" targetNode="_l6ZIIbdnEeau1vMV3Bsx4w"> | ||
9778 | <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//StringLiteral"/> | ||
9779 | <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//StringLiteral/@eGenericSuperTypes.0"/> | ||
9780 | <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_zEmC0HuWEeeCn_RNMwgEBg" targetArrow="InputClosedArrow" routingStyle="tree"> | ||
9781 | <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"/> | ||
9782 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_zEmC0XuWEeeCn_RNMwgEBg" showIcon="false"> | ||
9783 | <labelFormat>italic</labelFormat> | ||
9784 | </beginLabelStyle> | ||
9785 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_zEmC0nuWEeeCn_RNMwgEBg" showIcon="false"/> | ||
9786 | </ownedStyle> | ||
9787 | <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']"/> | ||
9788 | </ownedDiagramElements> | ||
9683 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> | 9789 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> |
9684 | <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_l6Zva7dnEeau1vMV3Bsx4w"/> | 9790 | <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_l6Zva7dnEeau1vMV3Bsx4w"/> |
9685 | <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/> | 9791 | <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/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore index 6a64a986..bf42e9b9 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore | |||
@@ -49,13 +49,13 @@ | |||
49 | </eClassifiers> | 49 | </eClassifiers> |
50 | <eClassifiers xsi:type="ecore:EClass" name="AtomicTerm" abstract="true" eSuperTypes="#//Term"/> | 50 | <eClassifiers xsi:type="ecore:EClass" name="AtomicTerm" abstract="true" eSuperTypes="#//Term"/> |
51 | <eClassifiers xsi:type="ecore:EClass" name="IntLiteral" eSuperTypes="#//AtomicTerm"> | 51 | <eClassifiers xsi:type="ecore:EClass" name="IntLiteral" eSuperTypes="#//AtomicTerm"> |
52 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> | 52 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> |
53 | </eClassifiers> | 53 | </eClassifiers> |
54 | <eClassifiers xsi:type="ecore:EClass" name="BoolLiteral" eSuperTypes="#//AtomicTerm"> | 54 | <eClassifiers xsi:type="ecore:EClass" name="BoolLiteral" eSuperTypes="#//AtomicTerm"> |
55 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> | 55 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> |
56 | </eClassifiers> | 56 | </eClassifiers> |
57 | <eClassifiers xsi:type="ecore:EClass" name="RealLiteral" eSuperTypes="#//AtomicTerm"> | 57 | <eClassifiers xsi:type="ecore:EClass" name="RealLiteral" eSuperTypes="#//AtomicTerm"> |
58 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigDecimal"/> | 58 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigDecimal"/> |
59 | </eClassifiers> | 59 | </eClassifiers> |
60 | <eClassifiers xsi:type="ecore:EClass" name="Variable" eSuperTypes="#//SymbolicDeclaration"> | 60 | <eClassifiers xsi:type="ecore:EClass" name="Variable" eSuperTypes="#//SymbolicDeclaration"> |
61 | <eStructuralFeatures xsi:type="ecore:EReference" name="range" lowerBound="1" eType="#//TypeReference" | 61 | <eStructuralFeatures xsi:type="ecore:EReference" name="range" lowerBound="1" eType="#//TypeReference" |
@@ -201,4 +201,7 @@ | |||
201 | containment="true"/> | 201 | containment="true"/> |
202 | </eClassifiers> | 202 | </eClassifiers> |
203 | <eClassifiers xsi:type="ecore:EClass" name="StringTypeReference" eSuperTypes="#//PrimitiveTypeReference"/> | 203 | <eClassifiers xsi:type="ecore:EClass" name="StringTypeReference" eSuperTypes="#//PrimitiveTypeReference"/> |
204 | <eClassifiers xsi:type="ecore:EClass" name="StringLiteral" eSuperTypes="#//AtomicTerm"> | ||
205 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> | ||
206 | </eClassifiers> | ||
204 | </ecore:EPackage> | 207 | </ecore:EPackage> |
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicModelInterpretation.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicModelInterpretation.xtend index aa59836c..905859eb 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicModelInterpretation.xtend +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicModelInterpretation.xtend | |||
@@ -27,6 +27,7 @@ interface LogicModelInterpretation{ | |||
27 | * <tr><td>Boolean literal </td><td>Boolean </td></tr> | 27 | * <tr><td>Boolean literal </td><td>Boolean </td></tr> |
28 | * <tr><td>Integer literal </td><td>Integer </td></tr> | 28 | * <tr><td>Integer literal </td><td>Integer </td></tr> |
29 | * <tr><td>Real literal </td><td>BigDecimal </td></tr> | 29 | * <tr><td>Real literal </td><td>BigDecimal </td></tr> |
30 | * <tr><td>String literal </td><td>String </td></tr> | ||
30 | * </table></p> | 31 | * </table></p> |
31 | * @param function The target function to be interpreted. | 32 | * @param function The target function to be interpreted. |
32 | * @param parameterSubstitution The array of the substituted parameters encoded as defined in the table. | 33 | * @param parameterSubstitution The array of the substituted parameters encoded as defined in the table. |
@@ -41,6 +42,7 @@ interface LogicModelInterpretation{ | |||
41 | * <tr><td>Boolean literal </td><td>Boolean </td></tr> | 42 | * <tr><td>Boolean literal </td><td>Boolean </td></tr> |
42 | * <tr><td>Integer literal </td><td>Integer </td></tr> | 43 | * <tr><td>Integer literal </td><td>Integer </td></tr> |
43 | * <tr><td>Real literal </td><td>BigDecimal </td></tr> | 44 | * <tr><td>Real literal </td><td>BigDecimal </td></tr> |
45 | * <tr><td>String literal </td><td>String </td></tr> | ||
44 | * </table></p> | 46 | * </table></p> |
45 | * @param relation The target relation to be interpreted. | 47 | * @param relation The target relation to be interpreted. |
46 | * @param parameterSubstitution The array of the substituted parameters encoded as defined in the table. | 48 | * @param parameterSubstitution The array of the substituted parameters encoded as defined in the table. |
@@ -55,6 +57,7 @@ interface LogicModelInterpretation{ | |||
55 | * <tr><td>Boolean literal </td><td>Boolean </td></tr> | 57 | * <tr><td>Boolean literal </td><td>Boolean </td></tr> |
56 | * <tr><td>Integer literal </td><td>Integer </td></tr> | 58 | * <tr><td>Integer literal </td><td>Integer </td></tr> |
57 | * <tr><td>Real literal </td><td>BigDecimal </td></tr> | 59 | * <tr><td>Real literal </td><td>BigDecimal </td></tr> |
60 | * <tr><td>String literal </td><td>String </td></tr> | ||
58 | * </table></p> | 61 | * </table></p> |
59 | * @param constant The target constant to be interpreted. | 62 | * @param constant The target constant to be interpreted. |
60 | * @return The value of the constant encoded as specified in the table. | 63 | * @return The value of the constant encoded as specified in the table. |
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicStructureBuilder.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicStructureBuilder.xtend index 760aa8b8..42f85a2d 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicStructureBuilder.xtend +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicStructureBuilder.xtend | |||
@@ -55,6 +55,10 @@ import org.eclipse.xtend.lib.annotations.Data | |||
55 | 55 | ||
56 | import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.* | 56 | import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.* |
57 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.InstanceOf | 57 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.InstanceOf |
58 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeReference | ||
59 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.BoolTypeReference | ||
60 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RealTypeReference | ||
61 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.StringTypeReference | ||
58 | 62 | ||
59 | @Data class InterpretationValidationResult { | 63 | @Data class InterpretationValidationResult { |
60 | val List<String> problems; | 64 | val List<String> problems; |
@@ -381,14 +385,28 @@ class LogicStructureBuilder{ | |||
381 | return (left as Number).asInteger == (right as Number).asInteger | 385 | return (left as Number).asInteger == (right as Number).asInteger |
382 | } | 386 | } |
383 | } else return left.equals(right) | 387 | } else return left.equals(right) |
384 | } | 388 | } |
385 | 389 | ||
386 | def allIntegers(LogicModelInterpretation interpretation) { | 390 | private dispatch def allObjects(LogicModelInterpretation interpretation, ComplexTypeReference type) { |
387 | if(interpretation.minimalInteger <= interpretation.maximalInteger) { | 391 | return interpretation.getElements(type.referred) |
388 | (interpretation.minimalInteger .. interpretation.maximalInteger).map[asInteger] | 392 | } |
389 | } else return emptySet | 393 | private dispatch def allObjects(LogicModelInterpretation interpretation, BoolTypeReference type) { |
394 | return #[true,false] | ||
395 | } | ||
396 | private dispatch def allObjects(LogicModelInterpretation interpretation, IntTypeReference type) { | ||
397 | return interpretation.allIntegersInStructure | ||
398 | } | ||
399 | private dispatch def allObjects(LogicModelInterpretation interpretation, RealTypeReference type) { | ||
400 | return interpretation.allRealsInStructure | ||
401 | } | ||
402 | private dispatch def allObjects(LogicModelInterpretation interpretation, StringTypeReference type) { | ||
403 | return interpretation.allStringsInStructure | ||
404 | } | ||
405 | private dispatch def allObjects(LogicModelInterpretation interpretation, TypeReference type) { | ||
406 | throw new UnsupportedOperationException('''Unknown type :«type.class.simpleName»!''') | ||
390 | } | 407 | } |
391 | 408 | ||
409 | |||
392 | def private boolean executeExists( | 410 | def private boolean executeExists( |
393 | Term expression, | 411 | Term expression, |
394 | LogicModelInterpretation interpretation, | 412 | LogicModelInterpretation interpretation, |
@@ -401,23 +419,13 @@ class LogicStructureBuilder{ | |||
401 | } | 419 | } |
402 | else { | 420 | else { |
403 | val unfoldedVariable = variablesToBind.head | 421 | val unfoldedVariable = variablesToBind.head |
404 | val possibleValuesType = unfoldedVariable.range | 422 | val possibleValues = interpretation.allObjects(unfoldedVariable.range) |
405 | if(possibleValuesType instanceof ComplexTypeReference) { | 423 | return possibleValues.exists[newBinding | |
406 | return this.getElements(interpretation,possibleValuesType.referred).exists[newBinding | | 424 | executeExists( |
407 | executeExists( | 425 | expression, |
408 | expression, | 426 | interpretation, |
409 | interpretation, | 427 | new HashMap(variableBinding) => [put(unfoldedVariable,newBinding)], |
410 | new HashMap(variableBinding) => [put(unfoldedVariable,newBinding)], | 428 | variablesToBind.subList(1,variablesToBind.size))] |
411 | variablesToBind.subList(1,variablesToBind.size))] | ||
412 | } else if(possibleValuesType instanceof IntTypeReference) { | ||
413 | return interpretation.allIntegers.exists[newBinding | | ||
414 | executeExists( | ||
415 | expression, | ||
416 | interpretation, | ||
417 | new HashMap(variableBinding) => [put(unfoldedVariable,newBinding)], | ||
418 | variablesToBind.subList(1,variablesToBind.size))] | ||
419 | } | ||
420 | else throw new UnsupportedOperationException('''Quantifying over type "«possibleValuesType»" is unsupported.''') | ||
421 | } | 429 | } |
422 | } | 430 | } |
423 | 431 | ||
@@ -432,22 +440,13 @@ class LogicStructureBuilder{ | |||
432 | } | 440 | } |
433 | else { | 441 | else { |
434 | val unfoldedVariable = variablesToBind.head | 442 | val unfoldedVariable = variablesToBind.head |
435 | val possibleValuesType = unfoldedVariable.range | 443 | val possibleValues = interpretation.allObjects(unfoldedVariable.range) |
436 | if(possibleValuesType instanceof ComplexTypeReference) { | 444 | return possibleValues.forall[newBinding | |
437 | return this.getElements(interpretation,possibleValuesType.referred).forall[newBinding | | 445 | executeForall( |
438 | executeForall( | 446 | expression, |
439 | expression, | 447 | interpretation, |
440 | interpretation, | 448 | new HashMap(variableBinding) => [put(unfoldedVariable,newBinding)], |
441 | new HashMap(variableBinding) => [put(unfoldedVariable,newBinding)], | 449 | variablesToBind.subList(1,variablesToBind.size))] |
442 | variablesToBind.subList(1,variablesToBind.size))] | ||
443 | } else if(possibleValuesType instanceof IntTypeReference) { | ||
444 | return interpretation.allIntegers.forall[newBinding | | ||
445 | executeForall( | ||
446 | expression, | ||
447 | interpretation, | ||
448 | new HashMap(variableBinding) => [put(unfoldedVariable,newBinding)], | ||
449 | variablesToBind.subList(1,variablesToBind.size))] | ||
450 | } else throw new UnsupportedOperationException('''Quantifying over type "«possibleValuesType»" is unsupported.''') | ||
451 | } | 450 | } |
452 | } | 451 | } |
453 | } \ No newline at end of file | 452 | } \ No newline at end of file |