aboutsummaryrefslogtreecommitdiffstats
path: root/Solvers
diff options
context:
space:
mode:
authorLibravatar OszkarSemerath <oszkar.semerath@gmail.com>2018-06-20 14:42:23 +0200
committerLibravatar OszkarSemerath <oszkar.semerath@gmail.com>2018-06-20 14:42:23 +0200
commit27187323b760bd7bba5e16cc75fadb041888e2c8 (patch)
treee1685c55dc7968381324d65e8ac64df079d4084a /Solvers
parentVisualisation stub removed (diff)
downloadVIATRA-Generator-27187323b760bd7bba5e16cc75fadb041888e2c8.tar.gz
VIATRA-Generator-27187323b760bd7bba5e16cc75fadb041888e2c8.tar.zst
VIATRA-Generator-27187323b760bd7bba5e16cc75fadb041888e2c8.zip
Fixing multiple "true" and "false" objects
Diffstat (limited to 'Solvers')
-rw-r--r--Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.aird149
-rw-r--r--Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend2
-rw-r--r--Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/PartialInterpretation2Logic.xtend3
-rw-r--r--Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend135
-rw-r--r--Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java10
5 files changed, 154 insertions, 145 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.aird b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.aird
index 35b87922..7fba84f6 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.aird
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.aird
@@ -583,22 +583,6 @@
583 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H4opkrXCEeamG-Ij7YnW7w" id="(0.28735632183908044,0.0)"/> 583 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H4opkrXCEeamG-Ij7YnW7w" id="(0.28735632183908044,0.0)"/>
584 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H4opk7XCEeamG-Ij7YnW7w" id="(0.38135593220338976,0.6964285714285714)"/> 584 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H4opk7XCEeamG-Ij7YnW7w" id="(0.38135593220338976,0.6964285714285714)"/>
585 </edges> 585 </edges>
586 <edges xmi:type="notation:Edge" xmi:id="_zI5OoLXCEeamG-Ij7YnW7w" type="4001" element="_zIoI4LXCEeamG-Ij7YnW7w" source="_Tg2p4LXCEeamG-Ij7YnW7w" target="_WfHcsLXAEeamG-Ij7YnW7w">
587 <children xmi:type="notation:Node" xmi:id="_zI5OpLXCEeamG-Ij7YnW7w" type="6001">
588 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zI5OpbXCEeamG-Ij7YnW7w" y="65"/>
589 </children>
590 <children xmi:type="notation:Node" xmi:id="_zI5OprXCEeamG-Ij7YnW7w" type="6002">
591 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zI5Op7XCEeamG-Ij7YnW7w" x="35" y="-1"/>
592 </children>
593 <children xmi:type="notation:Node" xmi:id="_zI51sLXCEeamG-Ij7YnW7w" type="6003">
594 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zI51sbXCEeamG-Ij7YnW7w" x="-20" y="1"/>
595 </children>
596 <styles xmi:type="notation:ConnectorStyle" xmi:id="_zI5OobXCEeamG-Ij7YnW7w" routing="Rectilinear"/>
597 <styles xmi:type="notation:FontStyle" xmi:id="_zI5OorXCEeamG-Ij7YnW7w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
598 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zI5Oo7XCEeamG-Ij7YnW7w" points="[-23, 0, -15, 73]$[-23, -73, -15, 0]"/>
599 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zI51srXCEeamG-Ij7YnW7w" id="(0.6325301204819277,0.0)"/>
600 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zI51s7XCEeamG-Ij7YnW7w" id="(0.6186440677966102,1.0)"/>
601 </edges>
602 <edges xmi:type="notation:Edge" xmi:id="_2TIWALXCEeamG-Ij7YnW7w" type="4001" element="_2Sy-0LXCEeamG-Ij7YnW7w" source="_ggJ5QLW_EeamG-Ij7YnW7w" target="_Tg2p4LXCEeamG-Ij7YnW7w"> 586 <edges xmi:type="notation:Edge" xmi:id="_2TIWALXCEeamG-Ij7YnW7w" type="4001" element="_2Sy-0LXCEeamG-Ij7YnW7w" source="_ggJ5QLW_EeamG-Ij7YnW7w" target="_Tg2p4LXCEeamG-Ij7YnW7w">
603 <children xmi:type="notation:Node" xmi:id="_2TI9ELXCEeamG-Ij7YnW7w" type="6001"> 587 <children xmi:type="notation:Node" xmi:id="_2TI9ELXCEeamG-Ij7YnW7w" type="6001">
604 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2TI9EbXCEeamG-Ij7YnW7w" x="135" y="154"/> 588 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2TI9EbXCEeamG-Ij7YnW7w" x="135" y="154"/>
@@ -663,30 +647,6 @@
663 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1xhTUIFNEeeA1-_2v4gJKA" id="(0.3448485229152273,0.2972972972972973)"/> 647 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1xhTUIFNEeeA1-_2v4gJKA" id="(0.3448485229152273,0.2972972972972973)"/>
664 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1xhTUYFNEeeA1-_2v4gJKA" id="(0.5,0.5)"/> 648 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1xhTUYFNEeeA1-_2v4gJKA" id="(0.5,0.5)"/>
665 </edges> 649 </edges>
666 <edges xmi:type="notation:Edge" xmi:id="_1xh6ZoFNEeeA1-_2v4gJKA" visible="false" type="4001" element="_1xSCwIFNEeeA1-_2v4gJKA" source="_Tg2p4LXCEeamG-Ij7YnW7w" target="_Tg2p4LXCEeamG-Ij7YnW7w">
667 <children xmi:type="notation:Node" xmi:id="_1xh6aoFNEeeA1-_2v4gJKA" type="6001">
668 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1xh6a4FNEeeA1-_2v4gJKA" x="-16" y="79"/>
669 </children>
670 <children xmi:type="notation:Node" xmi:id="_1xihcIFNEeeA1-_2v4gJKA" type="6002">
671 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1xihcYFNEeeA1-_2v4gJKA" x="89" y="-10"/>
672 </children>
673 <children xmi:type="notation:Node" xmi:id="_1xihcoFNEeeA1-_2v4gJKA" type="6003">
674 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1xihc4FNEeeA1-_2v4gJKA" x="-13" y="8"/>
675 </children>
676 <styles xmi:type="notation:ConnectorStyle" xmi:id="_1xh6Z4FNEeeA1-_2v4gJKA" routing="Rectilinear"/>
677 <styles xmi:type="notation:FontStyle" xmi:id="_1xh6aIFNEeeA1-_2v4gJKA" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
678 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1xh6aYFNEeeA1-_2v4gJKA" points="[-83, 0, -83, 0]$[-247, 0, -247, 0]$[-247, -13, -247, -13]$[-83, -13, -83, -13]"/>
679 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1xihdIFNEeeA1-_2v4gJKA" id="(0.5,0.49206349206349204)"/>
680 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1xihdYFNEeeA1-_2v4gJKA" id="(0.5,0.49206349206349204)"/>
681 </edges>
682 <edges xmi:type="notation:Connector" xmi:id="_T9b48GjoEei_cpJmVsHDhQ" visible="false" type="NoteAttachment" source="_S0_DIGjoEei_cpJmVsHDhQ" target="_1xh6ZoFNEeeA1-_2v4gJKA" lineWidth="1">
683 <styles xmi:type="notation:ArrowStyle" xmi:id="_T9b48WjoEei_cpJmVsHDhQ"/>
684 <styles xmi:type="notation:LineTypeStyle" xmi:id="_T9b48mjoEei_cpJmVsHDhQ"/>
685 <element xsi:nil="true"/>
686 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_T9b482joEei_cpJmVsHDhQ" points="[0, 0, 89, -37]$[-34, 14, 55, -23]"/>
687 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_T9j0wGjoEei_cpJmVsHDhQ" id="(0.55,1.0)"/>
688 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_T9j0wWjoEei_cpJmVsHDhQ" id="(0.3089005235602094,0.2465753424657534)"/>
689 </edges>
690 </data> 650 </data>
691 </ownedAnnotationEntries> 651 </ownedAnnotationEntries>
692 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_gf_hMLW_EeamG-Ij7YnW7w" name="PartialInterpretation" tooltipText="" outgoingEdges="_v4JW8LW_EeamG-Ij7YnW7w _2Grq4LXBEeamG-Ij7YnW7w _23ljYLXBEeamG-Ij7YnW7w _3UBAsLXBEeamG-Ij7YnW7w _H4YK4LXCEeamG-Ij7YnW7w _2Sy-0LXCEeamG-Ij7YnW7w _QrIkAL5UEea19paI6HZj1w _1xQNkIFNEeeA1-_2v4gJKA" width="12" height="10"> 652 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_gf_hMLW_EeamG-Ij7YnW7w" name="PartialInterpretation" tooltipText="" outgoingEdges="_v4JW8LW_EeamG-Ij7YnW7w _2Grq4LXBEeamG-Ij7YnW7w _23ljYLXBEeamG-Ij7YnW7w _3UBAsLXBEeamG-Ij7YnW7w _H4YK4LXCEeamG-Ij7YnW7w _2Sy-0LXCEeamG-Ij7YnW7w _QrIkAL5UEea19paI6HZj1w _1xQNkIFNEeeA1-_2v4gJKA" width="12" height="10">
@@ -1115,7 +1075,7 @@
1115 </ownedStyle> 1075 </ownedStyle>
1116 <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']"/> 1076 <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']"/>
1117 </ownedDiagramElements> 1077 </ownedDiagramElements>
1118 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_WexecLXAEeamG-Ij7YnW7w" name="TypeDeclaration" tooltipText="" outgoingEdges="_WfDLQLXAEeamG-Ij7YnW7w" incomingEdges="_zIoI4LXCEeamG-Ij7YnW7w" width="12" height="10"> 1078 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_WexecLXAEeamG-Ij7YnW7w" name="TypeDeclaration" tooltipText="" outgoingEdges="_WfDLQLXAEeamG-Ij7YnW7w" width="12" height="10">
1119 <target xmi:type="ecore:EClass" href="platform:/resource/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore#//TypeDeclaration"/> 1079 <target xmi:type="ecore:EClass" href="platform:/resource/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore#//TypeDeclaration"/>
1120 <semanticElements xmi:type="ecore:EClass" href="platform:/resource/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore#//TypeDeclaration"/> 1080 <semanticElements xmi:type="ecore:EClass" href="platform:/resource/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore#//TypeDeclaration"/>
1121 <decorations xmi:type="viewpoint:Decoration" xmi:id="_We8dkLXAEeamG-Ij7YnW7w"> 1081 <decorations xmi:type="viewpoint:Decoration" xmi:id="_We8dkLXAEeamG-Ij7YnW7w">
@@ -1124,11 +1084,10 @@
1124 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> 1084 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
1125 <arrangeConstraints>KEEP_SIZE</arrangeConstraints> 1085 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
1126 <arrangeConstraints>KEEP_RATIO</arrangeConstraints> 1086 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
1127 <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MmybgGjoEei_cpJmVsHDhQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" backgroundColor="237,201,122" foregroundColor="237,201,122"> 1087 <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_f5ngIG8UEeifqZoaQeIEkw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" backgroundColor="237,201,122" foregroundColor="237,201,122">
1128 <customFeatures>backgroundColor</customFeatures> 1088 <customFeatures>backgroundColor</customFeatures>
1129 <customFeatures>foregroundColor</customFeatures> 1089 <customFeatures>foregroundColor</customFeatures>
1130 <labelFormat>italic</labelFormat> 1090 <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"/>
1131 <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"/>
1132 </ownedStyle> 1091 </ownedStyle>
1133 <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']"/> 1092 <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']"/>
1134 </ownedDiagramElements> 1093 </ownedDiagramElements>
@@ -1296,28 +1255,18 @@
1296 </ownedStyle> 1255 </ownedStyle>
1297 <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']"/> 1256 <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']"/>
1298 </ownedDiagramElements> 1257 </ownedDiagramElements>
1299 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_TgoAYLXCEeamG-Ij7YnW7w" name="PartialTypeInterpratation" tooltipText="" outgoingEdges="_zIoI4LXCEeamG-Ij7YnW7w _klNtULXDEeamG-Ij7YnW7w _1xSCwIFNEeeA1-_2v4gJKA" incomingEdges="_2Sy-0LXCEeamG-Ij7YnW7w _1xSCwIFNEeeA1-_2v4gJKA" width="12" height="10"> 1258 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_TgoAYLXCEeamG-Ij7YnW7w" name="PartialTypeInterpratation" tooltipText="" outgoingEdges="_klNtULXDEeamG-Ij7YnW7w" incomingEdges="_2Sy-0LXCEeamG-Ij7YnW7w" width="12" height="10">
1300 <target xmi:type="ecore:EClass" href="PartialInterpretation.ecore#//PartialTypeInterpratation"/> 1259 <target xmi:type="ecore:EClass" href="PartialInterpretation.ecore#//PartialTypeInterpratation"/>
1301 <semanticElements xmi:type="ecore:EClass" href="PartialInterpretation.ecore#//PartialTypeInterpratation"/> 1260 <semanticElements xmi:type="ecore:EClass" href="PartialInterpretation.ecore#//PartialTypeInterpratation"/>
1302 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> 1261 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
1303 <arrangeConstraints>KEEP_SIZE</arrangeConstraints> 1262 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
1304 <arrangeConstraints>KEEP_RATIO</arrangeConstraints> 1263 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
1305 <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_TgoncLXCEeamG-Ij7YnW7w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> 1264 <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_f5qjcG8UEeifqZoaQeIEkw" 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">
1306 <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"/> 1265 <labelFormat>italic</labelFormat>
1266 <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"/>
1307 </ownedStyle> 1267 </ownedStyle>
1308 <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']"/> 1268 <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']"/>
1309 </ownedDiagramElements> 1269 </ownedDiagramElements>
1310 <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_zIoI4LXCEeamG-Ij7YnW7w" name="[1..1] interpretationOf" sourceNode="_TgoAYLXCEeamG-Ij7YnW7w" targetNode="_WexecLXAEeamG-Ij7YnW7w">
1311 <target xmi:type="ecore:EReference" href="PartialInterpretation.ecore#//PartialComplexTypeInterpretation/interpretationOf"/>
1312 <semanticElements xmi:type="ecore:EReference" href="PartialInterpretation.ecore#//PartialComplexTypeInterpretation/interpretationOf"/>
1313 <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_04uNgLXCEeamG-Ij7YnW7w" description="_v4J-ALW_EeamG-Ij7YnW7w" routingStyle="manhattan" strokeColor="0,0,0">
1314 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_04uNgbXCEeamG-Ij7YnW7w" showIcon="false">
1315 <labelFormat>bold</labelFormat>
1316 </centerLabelStyle>
1317 <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_04uNgrXCEeamG-Ij7YnW7w" labelSize="6" showIcon="false" labelColor="39,76,114"/>
1318 </ownedStyle>
1319 <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']"/>
1320 </ownedDiagramElements>
1321 <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_2Sy-0LXCEeamG-Ij7YnW7w" name="[0..*] partialtypeinterpratation" sourceNode="_gf_hMLW_EeamG-Ij7YnW7w" targetNode="_TgoAYLXCEeamG-Ij7YnW7w"> 1270 <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_2Sy-0LXCEeamG-Ij7YnW7w" name="[0..*] partialtypeinterpratation" sourceNode="_gf_hMLW_EeamG-Ij7YnW7w" targetNode="_TgoAYLXCEeamG-Ij7YnW7w">
1322 <target xmi:type="ecore:EReference" href="PartialInterpretation.ecore#//PartialInterpretation/partialtypeinterpratation"/> 1271 <target xmi:type="ecore:EReference" href="PartialInterpretation.ecore#//PartialInterpretation/partialtypeinterpratation"/>
1323 <semanticElements xmi:type="ecore:EReference" href="PartialInterpretation.ecore#//PartialInterpretation/partialtypeinterpratation"/> 1272 <semanticElements xmi:type="ecore:EReference" href="PartialInterpretation.ecore#//PartialInterpretation/partialtypeinterpratation"/>
@@ -1366,21 +1315,6 @@
1366 </ownedStyle> 1315 </ownedStyle>
1367 <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']"/> 1316 <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']"/>
1368 </ownedDiagramElements> 1317 </ownedDiagramElements>
1369 <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_1xSCwIFNEeeA1-_2v4gJKA" name="[0..*] supertypeInterpretation" visible="false" sourceNode="_TgoAYLXCEeamG-Ij7YnW7w" targetNode="_TgoAYLXCEeamG-Ij7YnW7w">
1370 <target xmi:type="ecore:EReference" href="PartialInterpretation.ecore#//PartialComplexTypeInterpretation/supertypeInterpretation"/>
1371 <semanticElements xmi:type="ecore:EReference" href="PartialInterpretation.ecore#//PartialComplexTypeInterpretation/supertypeInterpretation"/>
1372 <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_0VCPYGkJEei_cpJmVsHDhQ"/>
1373 <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_1xSCwYFNEeeA1-_2v4gJKA" routingStyle="manhattan" strokeColor="0,0,0">
1374 <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"/>
1375 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_1xSCwoFNEeeA1-_2v4gJKA" showIcon="false">
1376 <customFeatures>labelSize</customFeatures>
1377 </centerLabelStyle>
1378 <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_1xSCw4FNEeeA1-_2v4gJKA" showIcon="false" labelColor="39,76,114">
1379 <customFeatures>labelSize</customFeatures>
1380 </endLabelStyle>
1381 </ownedStyle>
1382 <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']"/>
1383 </ownedDiagramElements>
1384 <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> 1318 <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
1385 <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_MAfXJbW_EeamG-Ij7YnW7w"/> 1319 <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_MAfXJbW_EeamG-Ij7YnW7w"/>
1386 <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/> 1320 <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
@@ -1411,6 +1345,12 @@
1411 <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> 1345 <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
1412 </endLabelStyleDescription> 1346 </endLabelStyleDescription>
1413 </computedStyleDescriptions> 1347 </computedStyleDescriptions>
1348 <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_gFlQ0G8aEeifqZoaQeIEkw" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
1349 <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
1350 <labelFormat>bold</labelFormat>
1351 <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
1352 <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
1353 </computedStyleDescriptions>
1414 </data> 1354 </data>
1415 </ownedAnnotationEntries> 1355 </ownedAnnotationEntries>
1416 <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_pEmCu7XDEeamG-Ij7YnW7w" source="GMF_DIAGRAMS"> 1356 <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_pEmCu7XDEeamG-Ij7YnW7w" source="GMF_DIAGRAMS">
@@ -1434,11 +1374,19 @@
1434 <styles xmi:type="notation:FontStyle" xmi:id="_bOJh4Wm2Eei_cpJmVsHDhQ" fontName="Segoe UI" fontHeight="8"/> 1374 <styles xmi:type="notation:FontStyle" xmi:id="_bOJh4Wm2Eei_cpJmVsHDhQ" fontName="Segoe UI" fontHeight="8"/>
1435 <layoutConstraint xmi:type="notation:Location" xmi:id="_bOJh4mm2Eei_cpJmVsHDhQ"/> 1375 <layoutConstraint xmi:type="notation:Location" xmi:id="_bOJh4mm2Eei_cpJmVsHDhQ"/>
1436 </children> 1376 </children>
1377 <children xmi:type="notation:Node" xmi:id="_gGBVsG8aEeifqZoaQeIEkw" type="3010" element="_gFkpwG8aEeifqZoaQeIEkw">
1378 <styles xmi:type="notation:FontStyle" xmi:id="_gGBVsW8aEeifqZoaQeIEkw" fontName="Segoe UI" fontHeight="8" bold="true"/>
1379 <layoutConstraint xmi:type="notation:Location" xmi:id="_gGBVsm8aEeifqZoaQeIEkw"/>
1380 </children>
1381 <children xmi:type="notation:Node" xmi:id="_gGEZAG8aEeifqZoaQeIEkw" type="3010" element="_gFme8W8aEeifqZoaQeIEkw">
1382 <styles xmi:type="notation:FontStyle" xmi:id="_gGEZAW8aEeifqZoaQeIEkw" fontName="Segoe UI" fontHeight="8" bold="true"/>
1383 <layoutConstraint xmi:type="notation:Location" xmi:id="_gGEZAm8aEeifqZoaQeIEkw"/>
1384 </children>
1437 <styles xmi:type="notation:SortingStyle" xmi:id="_pEmCwLXDEeamG-Ij7YnW7w"/> 1385 <styles xmi:type="notation:SortingStyle" xmi:id="_pEmCwLXDEeamG-Ij7YnW7w"/>
1438 <styles xmi:type="notation:FilteringStyle" xmi:id="_pEmCwbXDEeamG-Ij7YnW7w"/> 1386 <styles xmi:type="notation:FilteringStyle" xmi:id="_pEmCwbXDEeamG-Ij7YnW7w"/>
1439 </children> 1387 </children>
1440 <styles xmi:type="notation:ShapeStyle" xmi:id="_pEmCwrXDEeamG-Ij7YnW7w" fontName="Segoe UI" fontHeight="8"/> 1388 <styles xmi:type="notation:ShapeStyle" xmi:id="_pEmCwrXDEeamG-Ij7YnW7w" fontName="Segoe UI" fontHeight="8"/>
1441 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pEmCw7XDEeamG-Ij7YnW7w" x="80" y="395" width="280" height="48"/> 1389 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pEmCw7XDEeamG-Ij7YnW7w" x="80" y="395" width="280" height="63"/>
1442 </children> 1390 </children>
1443 <children xmi:type="notation:Node" xmi:id="_pEmCxLXDEeamG-Ij7YnW7w" type="2003" element="_pEmrJbXDEeamG-Ij7YnW7w"> 1391 <children xmi:type="notation:Node" xmi:id="_pEmCxLXDEeamG-Ij7YnW7w" type="2003" element="_pEmrJbXDEeamG-Ij7YnW7w">
1444 <children xmi:type="notation:Node" xmi:id="_pEmCxbXDEeamG-Ij7YnW7w" type="5007"/> 1392 <children xmi:type="notation:Node" xmi:id="_pEmCxbXDEeamG-Ij7YnW7w" type="5007"/>
@@ -1501,7 +1449,7 @@
1501 <styles xmi:type="notation:FilteringStyle" xmi:id="_pEmp3bXDEeamG-Ij7YnW7w"/> 1449 <styles xmi:type="notation:FilteringStyle" xmi:id="_pEmp3bXDEeamG-Ij7YnW7w"/>
1502 </children> 1450 </children>
1503 <styles xmi:type="notation:ShapeStyle" xmi:id="_pEmp3rXDEeamG-Ij7YnW7w" fontName="Segoe UI" fontHeight="8" italic="true" fillColor="8047085"/> 1451 <styles xmi:type="notation:ShapeStyle" xmi:id="_pEmp3rXDEeamG-Ij7YnW7w" fontName="Segoe UI" fontHeight="8" italic="true" fillColor="8047085"/>
1504 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pEmp37XDEeamG-Ij7YnW7w" x="462" y="50" height="33"/> 1452 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pEmp37XDEeamG-Ij7YnW7w" x="462" y="50" width="135" height="33"/>
1505 </children> 1453 </children>
1506 <children xmi:type="notation:Node" xmi:id="_pEmp9LXDEeamG-Ij7YnW7w" type="2003" element="_pEmrYrXDEeamG-Ij7YnW7w"> 1454 <children xmi:type="notation:Node" xmi:id="_pEmp9LXDEeamG-Ij7YnW7w" type="2003" element="_pEmrYrXDEeamG-Ij7YnW7w">
1507 <children xmi:type="notation:Node" xmi:id="_pEmp9bXDEeamG-Ij7YnW7w" type="5007"/> 1455 <children xmi:type="notation:Node" xmi:id="_pEmp9bXDEeamG-Ij7YnW7w" type="5007"/>
@@ -1554,7 +1502,7 @@
1554 <styles xmi:type="notation:FilteringStyle" xmi:id="_ERrClrXFEeamG-Ij7YnW7w"/> 1502 <styles xmi:type="notation:FilteringStyle" xmi:id="_ERrClrXFEeamG-Ij7YnW7w"/>
1555 </children> 1503 </children>
1556 <styles xmi:type="notation:ShapeStyle" xmi:id="_ERrCkbXFEeamG-Ij7YnW7w" fontName="Segoe UI" fontHeight="8"/> 1504 <styles xmi:type="notation:ShapeStyle" xmi:id="_ERrCkbXFEeamG-Ij7YnW7w" fontName="Segoe UI" fontHeight="8"/>
1557 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ERrCkrXFEeamG-Ij7YnW7w" x="830" y="468" width="163" height="46"/> 1505 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ERrCkrXFEeamG-Ij7YnW7w" x="830" y="468" width="178" height="46"/>
1558 </children> 1506 </children>
1559 <children xmi:type="notation:Node" xmi:id="_HsPE8LXFEeamG-Ij7YnW7w" type="2003" element="_Hr5GsLXFEeamG-Ij7YnW7w"> 1507 <children xmi:type="notation:Node" xmi:id="_HsPE8LXFEeamG-Ij7YnW7w" type="2003" element="_Hr5GsLXFEeamG-Ij7YnW7w">
1560 <children xmi:type="notation:Node" xmi:id="_HsPsALXFEeamG-Ij7YnW7w" type="5007"/> 1508 <children xmi:type="notation:Node" xmi:id="_HsPsALXFEeamG-Ij7YnW7w" type="5007"/>
@@ -1592,7 +1540,7 @@
1592 <styles xmi:type="notation:ConnectorStyle" xmi:id="_pEmqLbXDEeamG-Ij7YnW7w" routing="Rectilinear"/> 1540 <styles xmi:type="notation:ConnectorStyle" xmi:id="_pEmqLbXDEeamG-Ij7YnW7w" routing="Rectilinear"/>
1593 <styles xmi:type="notation:FontStyle" xmi:id="_pEmqLrXDEeamG-Ij7YnW7w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/> 1541 <styles xmi:type="notation:FontStyle" xmi:id="_pEmqLrXDEeamG-Ij7YnW7w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
1594 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pEmqL7XDEeamG-Ij7YnW7w" points="[-68, -134, -17, 280]$[-68, -351, -17, 63]"/> 1542 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pEmqL7XDEeamG-Ij7YnW7w" points="[-68, -134, -17, 280]$[-68, -351, -17, 63]"/>
1595 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pEmqMLXDEeamG-Ij7YnW7w" id="(0.683476748013354,2.3260869565217392)"/> 1543 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pEmqMLXDEeamG-Ij7YnW7w" id="(0.683476748013354,1.7540983606557377)"/>
1596 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pEmqMbXDEeamG-Ij7YnW7w" id="(0.5,0.5229007633587787)"/> 1544 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pEmqMbXDEeamG-Ij7YnW7w" id="(0.5,0.5229007633587787)"/>
1597 </edges> 1545 </edges>
1598 <edges xmi:type="notation:Edge" xmi:id="_pEmqSrXDEeamG-Ij7YnW7w" type="4001" element="_pEmrSbXDEeamG-Ij7YnW7w" source="_pEmCxLXDEeamG-Ij7YnW7w" target="_pEmp2bXDEeamG-Ij7YnW7w"> 1546 <edges xmi:type="notation:Edge" xmi:id="_pEmqSrXDEeamG-Ij7YnW7w" type="4001" element="_pEmrSbXDEeamG-Ij7YnW7w" source="_pEmCxLXDEeamG-Ij7YnW7w" target="_pEmp2bXDEeamG-Ij7YnW7w">
@@ -1609,7 +1557,7 @@
1609 <styles xmi:type="notation:FontStyle" xmi:id="_pEmqUrXDEeamG-Ij7YnW7w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/> 1557 <styles xmi:type="notation:FontStyle" xmi:id="_pEmqUrXDEeamG-Ij7YnW7w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
1610 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pEmqU7XDEeamG-Ij7YnW7w" points="[139, 43, -207, -104]$[243, 43, -103, -104]"/> 1558 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pEmqU7XDEeamG-Ij7YnW7w" points="[139, 43, -207, -104]$[243, 43, -103, -104]"/>
1611 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pEmqVLXDEeamG-Ij7YnW7w" id="(0.5,0.04580152671755725)"/> 1559 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pEmqVLXDEeamG-Ij7YnW7w" id="(0.5,0.04580152671755725)"/>
1612 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pEmqVbXDEeamG-Ij7YnW7w" id="(0.5,3.161290322580645)"/> 1560 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pEmqVbXDEeamG-Ij7YnW7w" id="(0.44360902255639095,3.161290322580645)"/>
1613 </edges> 1561 </edges>
1614 <edges xmi:type="notation:Edge" xmi:id="_pEmqYrXDEeamG-Ij7YnW7w" visible="false" type="4001" element="_pEmrUbXDEeamG-Ij7YnW7w" source="_pEmCxLXDEeamG-Ij7YnW7w" target="_pEmpy7XDEeamG-Ij7YnW7w"> 1562 <edges xmi:type="notation:Edge" xmi:id="_pEmqYrXDEeamG-Ij7YnW7w" visible="false" type="4001" element="_pEmrUbXDEeamG-Ij7YnW7w" source="_pEmCxLXDEeamG-Ij7YnW7w" target="_pEmpy7XDEeamG-Ij7YnW7w">
1615 <children xmi:type="notation:Node" xmi:id="_pEmqY7XDEeamG-Ij7YnW7w" type="6001"> 1563 <children xmi:type="notation:Node" xmi:id="_pEmqY7XDEeamG-Ij7YnW7w" type="6001">
@@ -1641,11 +1589,11 @@
1641 <styles xmi:type="notation:FontStyle" xmi:id="_pEmqjrXDEeamG-Ij7YnW7w" fontName="Segoe UI" fontHeight="8"/> 1589 <styles xmi:type="notation:FontStyle" xmi:id="_pEmqjrXDEeamG-Ij7YnW7w" fontName="Segoe UI" fontHeight="8"/>
1642 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pEmqj7XDEeamG-Ij7YnW7w" points="[0, -159, 12, 59]$[0, -219, 12, -1]$[0, -219, 12, -1]$[0, -240, 12, -22]"/> 1590 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pEmqj7XDEeamG-Ij7YnW7w" points="[0, -159, 12, 59]$[0, -219, 12, -1]$[0, -219, 12, -1]$[0, -240, 12, -22]"/>
1643 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pEmqkLXDEeamG-Ij7YnW7w" id="(0.5,4.083333333333333)"/> 1591 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pEmqkLXDEeamG-Ij7YnW7w" id="(0.5,4.083333333333333)"/>
1644 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pEmqkbXDEeamG-Ij7YnW7w" id="(0.5,1.5806451612903225)"/> 1592 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pEmqkbXDEeamG-Ij7YnW7w" id="(0.44360902255639095,1.5806451612903225)"/>
1645 </edges> 1593 </edges>
1646 <edges xmi:type="notation:Edge" xmi:id="_pEmqtrXDEeamG-Ij7YnW7w" type="4001" element="_pEmrhLXDEeamG-Ij7YnW7w" source="_pEmqELXDEeamG-Ij7YnW7w" target="_pEmp9LXDEeamG-Ij7YnW7w"> 1594 <edges xmi:type="notation:Edge" xmi:id="_pEmqtrXDEeamG-Ij7YnW7w" type="4001" element="_pEmrhLXDEeamG-Ij7YnW7w" source="_pEmqELXDEeamG-Ij7YnW7w" target="_pEmp9LXDEeamG-Ij7YnW7w">
1647 <children xmi:type="notation:Node" xmi:id="_pEmqt7XDEeamG-Ij7YnW7w" type="6001"> 1595 <children xmi:type="notation:Node" xmi:id="_pEmqt7XDEeamG-Ij7YnW7w" type="6001">
1648 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pEmquLXDEeamG-Ij7YnW7w" x="66" y="-64"/> 1596 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pEmquLXDEeamG-Ij7YnW7w" x="56" y="-64"/>
1649 </children> 1597 </children>
1650 <children xmi:type="notation:Node" xmi:id="_pEmqubXDEeamG-Ij7YnW7w" type="6002"> 1598 <children xmi:type="notation:Node" xmi:id="_pEmqubXDEeamG-Ij7YnW7w" type="6002">
1651 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pEmqurXDEeamG-Ij7YnW7w" x="-25"/> 1599 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pEmqurXDEeamG-Ij7YnW7w" x="-25"/>
@@ -1672,7 +1620,7 @@
1672 <styles xmi:type="notation:ConnectorStyle" xmi:id="_pEmq4bXDEeamG-Ij7YnW7w" routing="Rectilinear"/> 1620 <styles xmi:type="notation:ConnectorStyle" xmi:id="_pEmq4bXDEeamG-Ij7YnW7w" routing="Rectilinear"/>
1673 <styles xmi:type="notation:FontStyle" xmi:id="_pEmq4rXDEeamG-Ij7YnW7w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/> 1621 <styles xmi:type="notation:FontStyle" xmi:id="_pEmq4rXDEeamG-Ij7YnW7w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
1674 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pEmq47XDEeamG-Ij7YnW7w" points="[12, -121, -104, -13]$[116, -121, 0, -13]"/> 1622 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pEmq47XDEeamG-Ij7YnW7w" points="[12, -121, -104, -13]$[116, -121, 0, -13]"/>
1675 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pEmq5LXDEeamG-Ij7YnW7w" id="(0.9568345323741008,3.108695652173913)"/> 1623 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pEmq5LXDEeamG-Ij7YnW7w" id="(0.9568345323741008,2.3442622950819674)"/>
1676 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pEmq5bXDEeamG-Ij7YnW7w" id="(0.0,0.9210526315789473)"/> 1624 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pEmq5bXDEeamG-Ij7YnW7w" id="(0.0,0.9210526315789473)"/>
1677 </edges> 1625 </edges>
1678 <edges xmi:type="notation:Edge" xmi:id="_pEmq8rXDEeamG-Ij7YnW7w" visible="false" type="4001" element="_pEmrmLXDEeamG-Ij7YnW7w" source="_pEmCvbXDEeamG-Ij7YnW7w" target="_pEmpy7XDEeamG-Ij7YnW7w"> 1626 <edges xmi:type="notation:Edge" xmi:id="_pEmq8rXDEeamG-Ij7YnW7w" visible="false" type="4001" element="_pEmrmLXDEeamG-Ij7YnW7w" source="_pEmCvbXDEeamG-Ij7YnW7w" target="_pEmpy7XDEeamG-Ij7YnW7w">
@@ -1688,7 +1636,7 @@
1688 <styles xmi:type="notation:ConnectorStyle" xmi:id="_pEmq-bXDEeamG-Ij7YnW7w" routing="Rectilinear"/> 1636 <styles xmi:type="notation:ConnectorStyle" xmi:id="_pEmq-bXDEeamG-Ij7YnW7w" routing="Rectilinear"/>
1689 <styles xmi:type="notation:FontStyle" xmi:id="_pEmq-rXDEeamG-Ij7YnW7w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/> 1637 <styles xmi:type="notation:FontStyle" xmi:id="_pEmq-rXDEeamG-Ij7YnW7w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
1690 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pEmq-7XDEeamG-Ij7YnW7w" points="[0, 0, 129, 231]$[0, -138, 129, 93]$[-129, -138, 0, 93]$[-129, -231, 0, 0]"/> 1638 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pEmq-7XDEeamG-Ij7YnW7w" points="[0, 0, 129, 231]$[0, -138, 129, 93]$[-129, -138, 0, 93]$[-129, -231, 0, 0]"/>
1691 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pEmq_LXDEeamG-Ij7YnW7w" id="(0.6187050359712232,1.2608695652173914)"/> 1639 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pEmq_LXDEeamG-Ij7YnW7w" id="(0.6187050359712232,0.9508196721311475)"/>
1692 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pEmq_bXDEeamG-Ij7YnW7w" id="(0.3813559322033898,0.5909090909090909)"/> 1640 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pEmq_bXDEeamG-Ij7YnW7w" id="(0.3813559322033898,0.5909090909090909)"/>
1693 </edges> 1641 </edges>
1694 <edges xmi:type="notation:Edge" xmi:id="_QSg-QLXFEeamG-Ij7YnW7w" type="4001" element="_QSMOILXFEeamG-Ij7YnW7w" source="_pEmqELXDEeamG-Ij7YnW7w" target="_n_b8ALXEEeamG-Ij7YnW7w"> 1642 <edges xmi:type="notation:Edge" xmi:id="_QSg-QLXFEeamG-Ij7YnW7w" type="4001" element="_QSMOILXFEeamG-Ij7YnW7w" source="_pEmqELXDEeamG-Ij7YnW7w" target="_n_b8ALXEEeamG-Ij7YnW7w">
@@ -1736,7 +1684,7 @@
1736 <styles xmi:type="notation:ConnectorStyle" xmi:id="_aX1BYbXFEeamG-Ij7YnW7w" routing="Tree"/> 1684 <styles xmi:type="notation:ConnectorStyle" xmi:id="_aX1BYbXFEeamG-Ij7YnW7w" routing="Tree"/>
1737 <styles xmi:type="notation:FontStyle" xmi:id="_aX1BYrXFEeamG-Ij7YnW7w" fontName="Segoe UI" fontHeight="8"/> 1685 <styles xmi:type="notation:FontStyle" xmi:id="_aX1BYrXFEeamG-Ij7YnW7w" fontName="Segoe UI" fontHeight="8"/>
1738 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aX1BY7XFEeamG-Ij7YnW7w" points="[0, 0, 20, 33]$[-20, -33, 0, 0]"/> 1686 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aX1BY7XFEeamG-Ij7YnW7w" points="[0, 0, 20, 33]$[-20, -33, 0, 0]"/>
1739 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aX1ocLXFEeamG-Ij7YnW7w" id="(0.5900621118012422,0.0)"/> 1687 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aX1ocLXFEeamG-Ij7YnW7w" id="(0.5397727272727273,0.0)"/>
1740 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aX1ocbXFEeamG-Ij7YnW7w" id="(0.2711864406779661,1.0)"/> 1688 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aX1ocbXFEeamG-Ij7YnW7w" id="(0.2711864406779661,1.0)"/>
1741 </edges> 1689 </edges>
1742 <edges xmi:type="notation:Edge" xmi:id="_aqyZoLXFEeamG-Ij7YnW7w" type="4001" element="_aqZYELXFEeamG-Ij7YnW7w" source="_HsPE8LXFEeamG-Ij7YnW7w" target="_n_b8ALXEEeamG-Ij7YnW7w"> 1690 <edges xmi:type="notation:Edge" xmi:id="_aqyZoLXFEeamG-Ij7YnW7w" type="4001" element="_aqZYELXFEeamG-Ij7YnW7w" source="_HsPE8LXFEeamG-Ij7YnW7w" target="_n_b8ALXEEeamG-Ij7YnW7w">
@@ -1800,7 +1748,7 @@
1800 <styles xmi:type="notation:ConnectorStyle" xmi:id="_2W2RAbXFEeamG-Ij7YnW7w" routing="Rectilinear"/> 1748 <styles xmi:type="notation:ConnectorStyle" xmi:id="_2W2RAbXFEeamG-Ij7YnW7w" routing="Rectilinear"/>
1801 <styles xmi:type="notation:FontStyle" xmi:id="_2W2RArXFEeamG-Ij7YnW7w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/> 1749 <styles xmi:type="notation:FontStyle" xmi:id="_2W2RArXFEeamG-Ij7YnW7w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
1802 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2W2RA7XFEeamG-Ij7YnW7w" points="[-6, 0, -16, -103]$[-6, 103, -16, 0]"/> 1750 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2W2RA7XFEeamG-Ij7YnW7w" points="[-6, 0, -16, -103]$[-6, 103, -16, 0]"/>
1803 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2W24FrXFEeamG-Ij7YnW7w" id="(0.5031055900621118,1.0)"/> 1751 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2W24FrXFEeamG-Ij7YnW7w" id="(0.46022727272727265,1.0)"/>
1804 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2W24F7XFEeamG-Ij7YnW7w" id="(0.5847457627118644,0.0)"/> 1752 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2W24F7XFEeamG-Ij7YnW7w" id="(0.5847457627118644,0.0)"/>
1805 </edges> 1753 </edges>
1806 <edges xmi:type="notation:Edge" xmi:id="_5HYe8LXFEeamG-Ij7YnW7w" type="4001" element="_5HFkALXFEeamG-Ij7YnW7w" source="_ERrCkLXFEeamG-Ij7YnW7w" target="_pEmpy7XDEeamG-Ij7YnW7w"> 1754 <edges xmi:type="notation:Edge" xmi:id="_5HYe8LXFEeamG-Ij7YnW7w" type="4001" element="_5HFkALXFEeamG-Ij7YnW7w" source="_ERrCkLXFEeamG-Ij7YnW7w" target="_pEmpy7XDEeamG-Ij7YnW7w">
@@ -1816,7 +1764,7 @@
1816 <styles xmi:type="notation:ConnectorStyle" xmi:id="_5HYe8bXFEeamG-Ij7YnW7w" routing="Rectilinear"/> 1764 <styles xmi:type="notation:ConnectorStyle" xmi:id="_5HYe8bXFEeamG-Ij7YnW7w" routing="Rectilinear"/>
1817 <styles xmi:type="notation:FontStyle" xmi:id="_5HYe8rXFEeamG-Ij7YnW7w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/> 1765 <styles xmi:type="notation:FontStyle" xmi:id="_5HYe8rXFEeamG-Ij7YnW7w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
1818 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5HYe87XFEeamG-Ij7YnW7w" points="[-40, 0, -12, -103]$[-40, 103, -12, 0]"/> 1766 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5HYe87XFEeamG-Ij7YnW7w" points="[-40, 0, -12, -103]$[-40, 103, -12, 0]"/>
1819 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5HZGALXFEeamG-Ij7YnW7w" id="(0.8074534161490683,1.0)"/> 1767 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5HZGALXFEeamG-Ij7YnW7w" id="(0.7386363636363636,1.0)"/>
1820 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5HZGAbXFEeamG-Ij7YnW7w" id="(0.6779661016949152,0.0)"/> 1768 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5HZGAbXFEeamG-Ij7YnW7w" id="(0.6779661016949152,0.0)"/>
1821 </edges> 1769 </edges>
1822 <edges xmi:type="notation:Edge" xmi:id="_RVMxwMAiEeaaj7sYFz2QKg" visible="false" type="4001" element="_RU0XQMAiEeaaj7sYFz2QKg" source="_pEmCvbXDEeamG-Ij7YnW7w" target="_pEmpy7XDEeamG-Ij7YnW7w"> 1770 <edges xmi:type="notation:Edge" xmi:id="_RVMxwMAiEeaaj7sYFz2QKg" visible="false" type="4001" element="_RU0XQMAiEeaaj7sYFz2QKg" source="_pEmCvbXDEeamG-Ij7YnW7w" target="_pEmpy7XDEeamG-Ij7YnW7w">
@@ -1832,7 +1780,7 @@
1832 <styles xmi:type="notation:ConnectorStyle" xmi:id="_RVMxwcAiEeaaj7sYFz2QKg" routing="Rectilinear"/> 1780 <styles xmi:type="notation:ConnectorStyle" xmi:id="_RVMxwcAiEeaaj7sYFz2QKg" routing="Rectilinear"/>
1833 <styles xmi:type="notation:FontStyle" xmi:id="_RVMxwsAiEeaaj7sYFz2QKg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/> 1781 <styles xmi:type="notation:FontStyle" xmi:id="_RVMxwsAiEeaaj7sYFz2QKg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
1834 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RVMxw8AiEeaaj7sYFz2QKg" points="[18, -12, -410, -200]$[18, 202, -410, 14]$[335, 202, -93, 14]"/> 1782 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RVMxw8AiEeaaj7sYFz2QKg" points="[18, -12, -410, -200]$[18, 202, -410, 14]$[335, 202, -93, 14]"/>
1835 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RVY_AMAiEeaaj7sYFz2QKg" id="(0.683476748013354,1.760869565217392)"/> 1783 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RVY_AMAiEeaaj7sYFz2QKg" id="(0.683476748013354,1.3278688524590168)"/>
1836 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RVY_AcAiEeaaj7sYFz2QKg" id="(0.5,0.2882483370288248)"/> 1784 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RVY_AcAiEeaaj7sYFz2QKg" id="(0.5,0.2882483370288248)"/>
1837 </edges> 1785 </edges>
1838 <edges xmi:type="notation:Edge" xmi:id="_1x68MPMUEeagPYxz1ZWLIQ" visible="false" type="4001" element="_1xkW4PMUEeagPYxz1ZWLIQ" source="_pEmCvbXDEeamG-Ij7YnW7w" target="_pEmCxLXDEeamG-Ij7YnW7w"> 1786 <edges xmi:type="notation:Edge" xmi:id="_1x68MPMUEeagPYxz1ZWLIQ" visible="false" type="4001" element="_1xkW4PMUEeagPYxz1ZWLIQ" source="_pEmCvbXDEeamG-Ij7YnW7w" target="_pEmCxLXDEeamG-Ij7YnW7w">
@@ -1848,7 +1796,7 @@
1848 <styles xmi:type="notation:ConnectorStyle" xmi:id="_1x68MfMUEeagPYxz1ZWLIQ" routing="Rectilinear"/> 1796 <styles xmi:type="notation:ConnectorStyle" xmi:id="_1x68MfMUEeagPYxz1ZWLIQ" routing="Rectilinear"/>
1849 <styles xmi:type="notation:FontStyle" xmi:id="_1x68MvMUEeagPYxz1ZWLIQ" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/> 1797 <styles xmi:type="notation:FontStyle" xmi:id="_1x68MvMUEeagPYxz1ZWLIQ" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
1850 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1x68M_MUEeagPYxz1ZWLIQ" points="[4, -23, 55, 402]$[4, -191, 55, 234]$[-64, -191, -13, 234]$[-64, -362, -13, 63]"/> 1798 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1x68M_MUEeagPYxz1ZWLIQ" points="[4, -23, 55, 402]$[4, -191, 55, 234]$[-64, -191, -13, 234]$[-64, -362, -13, 63]"/>
1851 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1yQ6cPMUEeagPYxz1ZWLIQ" id="(0.683476748013354,1.760869565217392)"/> 1799 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1yQ6cPMUEeagPYxz1ZWLIQ" id="(0.683476748013354,1.3278688524590168)"/>
1852 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1yQ6cfMUEeagPYxz1ZWLIQ" id="(0.5,0.5229007633587787)"/> 1800 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1yQ6cfMUEeagPYxz1ZWLIQ" id="(0.5,0.5229007633587787)"/>
1853 </edges> 1801 </edges>
1854 <edges xmi:type="notation:Edge" xmi:id="_oLwC8GnFEei_cpJmVsHDhQ" type="4001" element="_oLjOoGnFEei_cpJmVsHDhQ" source="_KRyK4LXFEeamG-Ij7YnW7w" target="_pEmpy7XDEeamG-Ij7YnW7w"> 1802 <edges xmi:type="notation:Edge" xmi:id="_oLwC8GnFEei_cpJmVsHDhQ" type="4001" element="_oLjOoGnFEei_cpJmVsHDhQ" source="_KRyK4LXFEeamG-Ij7YnW7w" target="_pEmpy7XDEeamG-Ij7YnW7w">
@@ -1906,7 +1854,7 @@
1906 </ownedStyle> 1854 </ownedStyle>
1907 <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']"/> 1855 <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']"/>
1908 </ownedElements> 1856 </ownedElements>
1909 <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_bN3OAGm2Eei_cpJmVsHDhQ" name=" scope : Scope" visible="false" tooltipText=""> 1857 <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_bN3OAGm2Eei_cpJmVsHDhQ" name=" scopes : Scope" visible="false" tooltipText="">
1910 <target xmi:type="ecore:EReference" href="PartialInterpretation.ecore#//PartialInterpretation/scopes"/> 1858 <target xmi:type="ecore:EReference" href="PartialInterpretation.ecore#//PartialInterpretation/scopes"/>
1911 <semanticElements xmi:type="ecore:EReference" href="PartialInterpretation.ecore#//PartialInterpretation/scopes"/> 1859 <semanticElements xmi:type="ecore:EReference" href="PartialInterpretation.ecore#//PartialInterpretation/scopes"/>
1912 <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_X8tzEWnGEei_cpJmVsHDhQ"/> 1860 <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_X8tzEWnGEei_cpJmVsHDhQ"/>
@@ -1915,6 +1863,22 @@
1915 </ownedStyle> 1863 </ownedStyle>
1916 <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']"/> 1864 <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']"/>
1917 </ownedElements> 1865 </ownedElements>
1866 <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_gFkpwG8aEeifqZoaQeIEkw" name="minNewElements : EInt = 0" tooltipText="">
1867 <target xmi:type="ecore:EAttribute" href="PartialInterpretation.ecore#//PartialInterpretation/minNewElements"/>
1868 <semanticElements xmi:type="ecore:EAttribute" href="PartialInterpretation.ecore#//PartialInterpretation/minNewElements"/>
1869 <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_gFme8G8aEeifqZoaQeIEkw" labelAlignment="LEFT" description="_gFlQ0G8aEeifqZoaQeIEkw">
1870 <labelFormat>bold</labelFormat>
1871 </ownedStyle>
1872 <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']"/>
1873 </ownedElements>
1874 <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_gFme8W8aEeifqZoaQeIEkw" name="maxNewElements : EInt = -1" tooltipText="">
1875 <target xmi:type="ecore:EAttribute" href="PartialInterpretation.ecore#//PartialInterpretation/maxNewElements"/>
1876 <semanticElements xmi:type="ecore:EAttribute" href="PartialInterpretation.ecore#//PartialInterpretation/maxNewElements"/>
1877 <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_gFnGAG8aEeifqZoaQeIEkw" labelAlignment="LEFT" description="_gFlQ0G8aEeifqZoaQeIEkw">
1878 <labelFormat>bold</labelFormat>
1879 </ownedStyle>
1880 <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']"/>
1881 </ownedElements>
1918 </ownedDiagramElements> 1882 </ownedDiagramElements>
1919 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_pEmrJbXDEeamG-Ij7YnW7w" name="LogicProblem" tooltipText="" outgoingEdges="_pEmrSbXDEeamG-Ij7YnW7w _pEmrUbXDEeamG-Ij7YnW7w" incomingEdges="_pEmrKLXDEeamG-Ij7YnW7w _1xkW4PMUEeagPYxz1ZWLIQ" width="12" height="10"> 1883 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_pEmrJbXDEeamG-Ij7YnW7w" name="LogicProblem" tooltipText="" outgoingEdges="_pEmrSbXDEeamG-Ij7YnW7w _pEmrUbXDEeamG-Ij7YnW7w" incomingEdges="_pEmrKLXDEeamG-Ij7YnW7w _1xkW4PMUEeagPYxz1ZWLIQ" width="12" height="10">
1920 <target xmi:type="ecore:EClass" href="platform:/resource/hu.bme.mit.inf.dslreasoner.logic.model/model/logicproblem.ecore#//LogicProblem"/> 1884 <target xmi:type="ecore:EClass" href="platform:/resource/hu.bme.mit.inf.dslreasoner.logic.model/model/logicproblem.ecore#//LogicProblem"/>
@@ -3063,7 +3027,7 @@
3063 </edges> 3027 </edges>
3064 <edges xmi:type="notation:Edge" xmi:id="_HUGZkGpLEeihhMJKm6QVPA" type="4001" element="_k3UAgmkJEei_cpJmVsHDhQ" source="_UfnqkGpJEeihhMJKm6QVPA" target="_k3T9mmkJEei_cpJmVsHDhQ"> 3028 <edges xmi:type="notation:Edge" xmi:id="_HUGZkGpLEeihhMJKm6QVPA" type="4001" element="_k3UAgmkJEei_cpJmVsHDhQ" source="_UfnqkGpJEeihhMJKm6QVPA" target="_k3T9mmkJEei_cpJmVsHDhQ">
3065 <children xmi:type="notation:Node" xmi:id="_HUGZlGpLEeihhMJKm6QVPA" type="6001"> 3029 <children xmi:type="notation:Node" xmi:id="_HUGZlGpLEeihhMJKm6QVPA" type="6001">
3066 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HUGZlWpLEeihhMJKm6QVPA" x="87" y="63"/> 3030 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HUGZlWpLEeihhMJKm6QVPA" x="133" y="108"/>
3067 </children> 3031 </children>
3068 <children xmi:type="notation:Node" xmi:id="_HUGZlmpLEeihhMJKm6QVPA" type="6002"> 3032 <children xmi:type="notation:Node" xmi:id="_HUGZlmpLEeihhMJKm6QVPA" type="6002">
3069 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HUGZl2pLEeihhMJKm6QVPA" y="10"/> 3033 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HUGZl2pLEeihhMJKm6QVPA" y="10"/>
@@ -3073,7 +3037,7 @@
3073 </children> 3037 </children>
3074 <styles xmi:type="notation:ConnectorStyle" xmi:id="_HUGZkWpLEeihhMJKm6QVPA" routing="Rectilinear"/> 3038 <styles xmi:type="notation:ConnectorStyle" xmi:id="_HUGZkWpLEeihhMJKm6QVPA" routing="Rectilinear"/>
3075 <styles xmi:type="notation:FontStyle" xmi:id="_HUGZkmpLEeihhMJKm6QVPA" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/> 3039 <styles xmi:type="notation:FontStyle" xmi:id="_HUGZkmpLEeihhMJKm6QVPA" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
3076 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HUGZk2pLEeihhMJKm6QVPA" points="[8, -5, 0, 232]$[8, -229, 0, 8]"/> 3040 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HUGZk2pLEeihhMJKm6QVPA" points="[35, -5, 27, 232]$[35, -229, 27, 8]"/>
3077 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HUGZmmpLEeihhMJKm6QVPA" id="(0.7788461538461539,0.11764705882352941)"/> 3041 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HUGZmmpLEeihhMJKm6QVPA" id="(0.7788461538461539,0.11764705882352941)"/>
3078 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HUGZm2pLEeihhMJKm6QVPA" id="(0.625,0.813953488372093)"/> 3042 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HUGZm2pLEeihhMJKm6QVPA" id="(0.625,0.813953488372093)"/>
3079 </edges> 3043 </edges>
@@ -3334,11 +3298,10 @@
3334 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> 3298 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
3335 <arrangeConstraints>KEEP_SIZE</arrangeConstraints> 3299 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
3336 <arrangeConstraints>KEEP_RATIO</arrangeConstraints> 3300 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
3337 <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_k3UAT2kJEei_cpJmVsHDhQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" backgroundColor="237,201,122" foregroundColor="237,201,122"> 3301 <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_PyP-gG8VEeifqZoaQeIEkw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" backgroundColor="237,201,122" foregroundColor="237,201,122">
3338 <customFeatures>backgroundColor</customFeatures> 3302 <customFeatures>backgroundColor</customFeatures>
3339 <customFeatures>foregroundColor</customFeatures> 3303 <customFeatures>foregroundColor</customFeatures>
3340 <labelFormat>italic</labelFormat> 3304 <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"/>
3341 <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"/>
3342 </ownedStyle> 3305 </ownedStyle>
3343 <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']"/> 3306 <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']"/>
3344 </ownedDiagramElements> 3307 </ownedDiagramElements>
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend
index 9a737ab9..f4fc1fce 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend
@@ -54,7 +54,7 @@ class InstanceModel2PartialInterpretation {
54 val object = objects.get(objectIndex) 54 val object = objects.get(objectIndex)
55 val element = createDefinedElement => [ 55 val element = createDefinedElement => [
56 it.name = if(withID) 56 it.name = if(withID)
57 { '''PartialObject«objectIndex»''' } else 57 { '''o «objectIndex»''' } else
58 { null } 58 { null }
59 ] 59 ]
60 60
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/PartialInterpretation2Logic.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/PartialInterpretation2Logic.xtend
index e4ad4295..5d8d9313 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/PartialInterpretation2Logic.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/PartialInterpretation2Logic.xtend
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil
23import org.eclipse.xtend.lib.annotations.Data 23import org.eclipse.xtend.lib.annotations.Data
24 24
25import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.* 25import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*
26import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PrimitiveElement
26 27
27@Data class PartialInterpretation2Logic_Trace { 28@Data class PartialInterpretation2Logic_Trace {
28 Map<DefinedElement,DefinedElement> new2Old = new HashMap 29 Map<DefinedElement,DefinedElement> new2Old = new HashMap
@@ -66,7 +67,7 @@ class PartialInterpretation2Logic {
66// newElement.name = '''o «newElementIndex++»''' 67// newElement.name = '''o «newElementIndex++»'''
67// p.elements += newElement 68// p.elements += newElement
68// } 69// }
69 p.elements += i.newElements 70 p.elements += i.newElements.filter[!it instanceof PrimitiveElement]
70 } 71 }
71 72
72 private def splitTypeIntoTwo(LogicProblem p, PartialComplexTypeInterpretation partialTypeDeclaration,PartialInterpretation2Logic_Trace trace) { 73 private def splitTypeIntoTwo(LogicProblem p, PartialComplexTypeInterpretation partialTypeDeclaration,PartialInterpretation2Logic_Trace trace) {
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend
index cdc79743..2a350d53 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend
@@ -2,8 +2,6 @@ package hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage
2 2
3import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput 3import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput
4import hu.bme.mit.inf.dslreasoner.logic.model.builder.TypeScopes 4import hu.bme.mit.inf.dslreasoner.logic.model.builder.TypeScopes
5import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ConstantDeclaration
6import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.FunctionDeclaration
7import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguageFactory 5import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguageFactory
8import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration 6import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration
9import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type 7import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type
@@ -12,12 +10,18 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDefinition
12import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem 10import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem
13import hu.bme.mit.inf.dslreasoner.logic.model.patterns.SupertypeStar 11import hu.bme.mit.inf.dslreasoner.logic.model.patterns.SupertypeStar
14import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partial2logicannotations.PartialModelRelation2Assertion 12import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partial2logicannotations.PartialModelRelation2Assertion
13import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.BooleanElement
14import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.IntegerElement
15import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialBooleanInterpretation
15import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialComplexTypeInterpretation 16import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialComplexTypeInterpretation
16import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialConstantInterpretation 17import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialIntegerInterpretation
17import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialFunctionInterpretation
18import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation 18import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
19import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialRealInterpretation
19import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialRelationInterpretation 20import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialRelationInterpretation
21import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialStringInterpretation
20import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationFactory 22import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationFactory
23import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.RealElement
24import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.StringElement
21import java.math.BigDecimal 25import java.math.BigDecimal
22import java.util.HashMap 26import java.util.HashMap
23import java.util.Map 27import java.util.Map
@@ -30,8 +34,19 @@ import org.eclipse.xtend.lib.annotations.Data
30import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.* 34import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*
31 35
32@Data class Problem2PartialInterpretationTrace { 36@Data class Problem2PartialInterpretationTrace {
33 Map<TypeDeclaration, PartialComplexTypeInterpretation> type2Interpretation = new HashMap 37 Map<TypeDeclaration, PartialComplexTypeInterpretation> type2Interpretation
34 Map<RelationDeclaration, PartialRelationInterpretation> relation2Interpretation = new HashMap 38 PrimitiveValueTrace primitiveValues
39 Map<RelationDeclaration, PartialRelationInterpretation> relation2Interpretation
40}
41@Data class PrimitiveValueTrace {
42 PartialBooleanInterpretation booleanInterpretation
43 Map<Boolean,BooleanElement> booleanMap
44 PartialIntegerInterpretation integerInterpretation
45 Map<Integer,IntegerElement> integerMap
46 PartialRealInterpretation realInterpretation
47 Map<BigDecimal,RealElement> realMap
48 PartialStringInterpretation stringInterpretation
49 Map<String,StringElement> stringMap
35} 50}
36 51
37/** 52/**
@@ -48,34 +63,49 @@ class PartialInterpretationInitialiser {
48 LogicProblem problem, 63 LogicProblem problem,
49 TypeScopes typeScopes) 64 TypeScopes typeScopes)
50 { 65 {
51 66 val res = createPartialInterpretation
52 val trace = new Problem2PartialInterpretationTrace 67 res.problem = problem
53
54 val res = createPartialInterpretation => [
55 it.problem = problem
56 68
57 // Initialise primitive elements 69 // Initialise primitive elements
58 initBooleans(it) 70 val booleanType = initBooleans(res)
59 initIntegers(it, typeScopes.knownIntegers, typeScopes.minNewIntegers, typeScopes.maxNewIntegers) 71 val integerType = initIntegers(res, typeScopes.knownIntegers, typeScopes.minNewIntegers, typeScopes.maxNewIntegers)
60 initReals(it, typeScopes.knownReals, typeScopes.minNewReals, typeScopes.maxNewReals) 72 val realType = initReals(res, typeScopes.knownReals, typeScopes.minNewReals, typeScopes.maxNewReals)
61 initStrings(it,typeScopes.knownStrings, typeScopes.minNewStrings, typeScopes.maxNewStrings) 73 val stringType= initStrings(res,typeScopes.knownStrings, typeScopes.minNewStrings, typeScopes.maxNewStrings)
62 // Initialise complex elements 74 val primitiveTrace = createPrimitiveTrace(booleanType, integerType, realType, stringType)
63 initElements(it, 75 // Initialise complex elements
64 typeScopes.minNewElementsByType, 76
65 typeScopes.maxNewElementsByType, 77 val type2Interpretation = initElements(res,
66 typeScopes.minNewElements, 78 typeScopes.minNewElementsByType,
67 typeScopes.maxNewElements, 79 typeScopes.maxNewElementsByType,
68 trace 80 typeScopes.minNewElements,
69 ) 81 typeScopes.maxNewElements)
70 82
71 // Initialise relations 83 // Initialise relations
72 initRelations(it,trace) 84 val relation2Interpretation = initRelations(res)
73 ]
74 85
86 val trace = new Problem2PartialInterpretationTrace(type2Interpretation,primitiveTrace,relation2Interpretation)
75 return new TracedOutput(res,trace) 87 return new TracedOutput(res,trace)
76 } 88 }
77 89
78 def protected boolean initBooleans(PartialInterpretation partialInterpretation) { 90 def createPrimitiveTrace(
91 PartialBooleanInterpretation booleanType,
92 PartialIntegerInterpretation integerType,
93 PartialRealInterpretation realType,
94 PartialStringInterpretation stringType)
95 {
96 return new PrimitiveValueTrace(
97 booleanType,
98 booleanType.elements.filter(BooleanElement).toMap[value],
99 integerType,
100 integerType.elements.filter(IntegerElement).toMap[value],
101 realType,
102 realType.elements.filter(RealElement).toMap[value],
103 stringType,
104 stringType.elements.filter(StringElement).toMap[value]
105 )
106 }
107
108 def protected initBooleans(PartialInterpretation partialInterpretation) {
79 val booleanInterpretation = createPartialBooleanInterpretation 109 val booleanInterpretation = createPartialBooleanInterpretation
80 partialInterpretation.partialtypeinterpratation += booleanInterpretation 110 partialInterpretation.partialtypeinterpratation += booleanInterpretation
81 111
@@ -86,6 +116,8 @@ class PartialInterpretationInitialiser {
86 val falseElement = createBooleanElement => [it.name = "false" it.value = false it.valueSet = true] 116 val falseElement = createBooleanElement => [it.name = "false" it.value = false it.valueSet = true]
87 booleanInterpretation.elements += falseElement 117 booleanInterpretation.elements += falseElement
88 partialInterpretation.newElements+=falseElement 118 partialInterpretation.newElements+=falseElement
119
120 return booleanInterpretation
89 } 121 }
90 122
91 def protected initIntegers(PartialInterpretation partialInterpretation, SortedSet<Integer> knownIntegers, int minNewIntegers, int maxNewIntegers) { 123 def protected initIntegers(PartialInterpretation partialInterpretation, SortedSet<Integer> knownIntegers, int minNewIntegers, int maxNewIntegers) {
@@ -100,6 +132,8 @@ class PartialInterpretationInitialiser {
100 if(maxNewIntegers>0) { 132 if(maxNewIntegers>0) {
101 throw new UnsupportedOperationException('''Unspecified Integers are currently not supported!''') 133 throw new UnsupportedOperationException('''Unspecified Integers are currently not supported!''')
102 } 134 }
135
136 return integerInterpretation
103 } 137 }
104 138
105 def protected initReals(PartialInterpretation partialInterpretation, SortedSet<BigDecimal> knownReals, int minNewReals, int maxNewReals) { 139 def protected initReals(PartialInterpretation partialInterpretation, SortedSet<BigDecimal> knownReals, int minNewReals, int maxNewReals) {
@@ -114,6 +148,7 @@ class PartialInterpretationInitialiser {
114 if(maxNewReals>0) { 148 if(maxNewReals>0) {
115 throw new UnsupportedOperationException('''Unspecified Real values are currently not supported!''') 149 throw new UnsupportedOperationException('''Unspecified Real values are currently not supported!''')
116 } 150 }
151 return realInterpretation
117 } 152 }
118 153
119 def protected initStrings(PartialInterpretation partialInterpretation, SortedSet<String> knownStrings, int minNewStrings, int maxNewStrings) { 154 def protected initStrings(PartialInterpretation partialInterpretation, SortedSet<String> knownStrings, int minNewStrings, int maxNewStrings) {
@@ -128,13 +163,15 @@ class PartialInterpretationInitialiser {
128 if(maxNewStrings>0) { 163 if(maxNewStrings>0) {
129 throw new UnsupportedOperationException('''Unspecified String values are currently not supported!''') 164 throw new UnsupportedOperationException('''Unspecified String values are currently not supported!''')
130 } 165 }
166
167 return stringInterpretation
131 } 168 }
132 169
133 def protected initElements(PartialInterpretation interpretation, 170 def protected initElements(PartialInterpretation interpretation,
134 Map<Type, Integer> minNewElementsByType, Map<Type, Integer> maxNewElementsByType, 171 Map<Type, Integer> minNewElementsByType, Map<Type, Integer> maxNewElementsByType,
135 int minNewElements, int maxNewElements, 172 int minNewElements, int maxNewElements)
136 Problem2PartialInterpretationTrace trace)
137 { 173 {
174 val Map<TypeDeclaration, PartialComplexTypeInterpretation> type2Interpretation = new HashMap
138 val engine = ViatraQueryEngine.on(new EMFScope(interpretation.problem)) 175 val engine = ViatraQueryEngine.on(new EMFScope(interpretation.problem))
139 // Elements 176 // Elements
140 interpretation.minNewElements = minNewElements 177 interpretation.minNewElements = minNewElements
@@ -146,37 +183,45 @@ class PartialInterpretationInitialiser {
146 } 183 }
147 184
148 for(typeDeclaration : interpretation.problem.types.filter(TypeDeclaration)) { 185 for(typeDeclaration : interpretation.problem.types.filter(TypeDeclaration)) {
149 val typeInterpretation = typeDeclaration.initialisePartialTypeInterpretation(engine,trace) 186 val typeInterpretation = typeDeclaration.initialisePartialTypeInterpretation(engine)
150 interpretation.partialtypeinterpratation += typeInterpretation 187 interpretation.partialtypeinterpratation += typeInterpretation
188 type2Interpretation.put(typeDeclaration,typeInterpretation)
151 } 189 }
152 interpretation.problem.connectSuperypes(trace) 190 interpretation.problem.connectSuperypes(type2Interpretation)
191 return type2Interpretation
153 } 192 }
154 193
155 def private connectSuperypes(LogicProblem problem, Problem2PartialInterpretationTrace trace) { 194 def private connectSuperypes(LogicProblem problem, Map<TypeDeclaration, PartialComplexTypeInterpretation> trace) {
156 for(typeDeclaration : problem.types.filter(TypeDeclaration)) { 195 for(typeDeclaration : problem.types.filter(TypeDeclaration)) {
157 val supertypes = typeDeclaration.<Type>transitiveClosurePlus[it.supertypes] 196 val supertypes = typeDeclaration.<Type>transitiveClosurePlus[it.supertypes]
158 for(supertype : supertypes.filter(TypeDeclaration)) { 197 for(supertype : supertypes.filter(TypeDeclaration)) {
159 typeDeclaration.lookup(trace.type2Interpretation).supertypeInterpretation += supertype.lookup(trace.type2Interpretation) 198 typeDeclaration.lookup(trace).supertypeInterpretation += supertype.lookup(trace)
160 //println('''«typeDeclaration.name» --> «supertype.name»''') 199 //println('''«typeDeclaration.name» --> «supertype.name»''')
161 } 200 }
162 } 201 }
163 } 202 }
164 203
165 def private initRelations(PartialInterpretation interpretation, Problem2PartialInterpretationTrace trace) { 204 def private initRelations(PartialInterpretation interpretation) {
166 interpretation.partialrelationinterpretation += interpretation.problem.relations.filter(RelationDeclaration) 205 val Map<RelationDeclaration, PartialRelationInterpretation> relation2Interpretation = new HashMap
167 .map[initialisePartialRelationInterpretation(trace)] 206 for(relation : interpretation.problem.relations.filter(RelationDeclaration)) {
207 val partialInterpretation = relation.initialisePartialRelationInterpretation
208 interpretation.partialrelationinterpretation += partialInterpretation
209 relation2Interpretation.put(relation,partialInterpretation)
210 }
168 for(pMR2A : interpretation.problem.annotations.filter(PartialModelRelation2Assertion)) { 211 for(pMR2A : interpretation.problem.annotations.filter(PartialModelRelation2Assertion)) {
169 val relation = pMR2A.targetRelation 212 val relation = pMR2A.targetRelation
170 val r = relation.lookup(trace.relation2Interpretation) 213 val r = relation.lookup(relation2Interpretation)
171 r.relationlinks+=pMR2A.links.map[EcoreUtil.copy(it)] 214 r.relationlinks+=pMR2A.links.map[EcoreUtil.copy(it)]
172 } 215 }
173// interpretation.partialfunctioninterpretation += interpretation.problem.functions.filter(FunctionDeclaration) 216// interpretation.partialfunctioninterpretation += interpretation.problem.functions.filter(FunctionDeclaration)
174// .map[initialisePartialFunctionInterpretation(trace)] 217// .map[initialisePartialFunctionInterpretation(trace)]
175// interpretation.partialconstantinterpretation += interpretation.problem.constants.filter(ConstantDeclaration) 218// interpretation.partialconstantinterpretation += interpretation.problem.constants.filter(ConstantDeclaration)
176// .map[initialisePartialConstantDeclaration(trace)] 219// .map[initialisePartialConstantDeclaration(trace)]
220
221 return relation2Interpretation
177 } 222 }
178 223
179 def private initialisePartialTypeInterpretation(TypeDeclaration t, ViatraQueryEngine engine, Problem2PartialInterpretationTrace trace) { 224 def private initialisePartialTypeInterpretation(TypeDeclaration t, ViatraQueryEngine engine) {
180 val supertypeMatcher = SupertypeStar.Matcher.on(engine) 225 val supertypeMatcher = SupertypeStar.Matcher.on(engine)
181 val res = createPartialComplexTypeInterpretation => [ 226 val res = createPartialComplexTypeInterpretation => [
182 it.interpretationOf = t 227 it.interpretationOf = t
@@ -184,11 +229,10 @@ class PartialInterpretationInitialiser {
184 .filter(TypeDefinition) 229 .filter(TypeDefinition)
185 .map[elements].flatten 230 .map[elements].flatten
186 ] 231 ]
187 trace.type2Interpretation.put(t,res)
188 return res 232 return res
189 } 233 }
190 234
191 def private initialisePartialRelationInterpretation(RelationDeclaration r, Problem2PartialInterpretationTrace trace) { 235 def private initialisePartialRelationInterpretation(RelationDeclaration r) {
192 val res = createPartialRelationInterpretation => [ 236 val res = createPartialRelationInterpretation => [
193 it.interpretationOf = r 237 it.interpretationOf = r
194 if(r.parameters.size==2) { 238 if(r.parameters.size==2) {
@@ -196,15 +240,6 @@ class PartialInterpretationInitialiser {
196 it.param2 = r.parameters.get(1) 240 it.param2 = r.parameters.get(1)
197 } else throw new UnsupportedOperationException 241 } else throw new UnsupportedOperationException
198 ] 242 ]
199 trace.relation2Interpretation.put(r,res)
200 return res 243 return res
201 } 244 }
202
203 def private PartialConstantInterpretation initialisePartialConstantDeclaration(ConstantDeclaration c, Problem2PartialInterpretationTrace trace) {
204 throw new UnsupportedOperationException
205 }
206
207 def private PartialFunctionInterpretation initialisePartialFunctionInterpretation(FunctionDeclaration f, Problem2PartialInterpretationTrace trace) {
208 throw new UnsupportedOperationException
209 }
210} \ No newline at end of file 245} \ No newline at end of file
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
index e73d97b3..7862262b 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
@@ -112,6 +112,13 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
112 this.solutionStore = context.getGlobalContext().getSolutionStore(); 112 this.solutionStore = context.getGlobalContext().getSolutionStore();
113 113
114 ViatraQueryEngine engine = context.getQueryEngine(); 114 ViatraQueryEngine engine = context.getQueryEngine();
115// // TODO: visualisation
116// matchers = new LinkedList<ViatraQueryMatcher<? extends IPatternMatch>>();
117// for(IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> p : this.method.getAllPatterns()) {
118// System.out.println(p.getSimpleName());
119// ViatraQueryMatcher<? extends IPatternMatch> matcher = p.getMatcher(engine);
120// matchers.add(matcher);
121// }
115 122
116 this.solutionStoreWithCopy = new SolutionStoreWithCopy(); 123 this.solutionStoreWithCopy = new SolutionStoreWithCopy();
117 this.solutionStoreWithDiversityDescriptor = new SolutionStoreWithDiversityDescriptor(configuration.diversityRequirement); 124 this.solutionStoreWithDiversityDescriptor = new SolutionStoreWithDiversityDescriptor(configuration.diversityRequirement);
@@ -181,6 +188,9 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
181 context.executeAcitvationId(nextActivation); 188 context.executeAcitvationId(nextActivation);
182 189
183 visualiseCurrentState(); 190 visualiseCurrentState();
191// for(ViatraQueryMatcher<? extends IPatternMatch> matcher : matchers) {
192// System.out.println(matcher.getPatternName() + " - " + matcher.getAllValues("element"));
193// }
184 194
185 boolean consistencyCheckResult = checkConsistency(currentTrajectoryWithFittness); 195 boolean consistencyCheckResult = checkConsistency(currentTrajectoryWithFittness);
186 if(consistencyCheckResult == true) { continue mainLoop; } 196 if(consistencyCheckResult == true) { continue mainLoop; }
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-06-28 16:26:40 +0000