2 files changed, 31 insertions, 3 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 bed19d16..a03a5b35 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
@@ -8754,9 +8754,25 @@
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mN2HmoKhEeeAppuRs-roLg" id="(0.5,0.0)"/>

           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mN2Hm4KhEeeAppuRs-roLg" id="(0.3592233009708738,1.0)"/>

         </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_sHL8sIKlEeeAppuRs-roLg" type="4001" element="_sGSk0IKlEeeAppuRs-roLg" source="_PSQLAIKgEeeAppuRs-roLg" target="_l6XR27dnEeau1vMV3Bsx4w">

+          <children xmi:type="notation:Node" xmi:id="_sHL8tIKlEeeAppuRs-roLg" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sHL8tYKlEeeAppuRs-roLg" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_sHL8toKlEeeAppuRs-roLg" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sHL8t4KlEeeAppuRs-roLg" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_sHL8uIKlEeeAppuRs-roLg" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sHL8uYKlEeeAppuRs-roLg" y="10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sHL8sYKlEeeAppuRs-roLg" routing="Tree"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_sHL8soKlEeeAppuRs-roLg" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sHL8s4KlEeeAppuRs-roLg" points="[0, 0, 352, 174]$[-352, -174, 0, 0]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sHL8uoKlEeeAppuRs-roLg" id="(0.0,0.5)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sHL8u4KlEeeAppuRs-roLg" id="(0.5,1.0)"/>

+        </edges>

       </data>

     </ownedAnnotationEntries>

-    <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 _Vi5psIKgEeeAppuRs-roLg _YRIxkIKgEeeAppuRs-roLg" width="12" height="10">

+    <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 _Vi5psIKgEeeAppuRs-roLg _YRIxkIKgEeeAppuRs-roLg _sGSk0IKlEeeAppuRs-roLg" width="12" height="10">

       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Term"/>

       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Term"/>

       <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZIGrdnEeau1vMV3Bsx4w" 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">

@@ -9909,7 +9925,7 @@
       </ownedStyle>

       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

     </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_PQURUIKgEeeAppuRs-roLg" name="TransitiveClosure" tooltipText="" outgoingEdges="_Vi5psIKgEeeAppuRs-roLg _YRIxkIKgEeeAppuRs-roLg _mNGgsIKhEeeAppuRs-roLg" width="12" height="10">

+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_PQURUIKgEeeAppuRs-roLg" name="TransitiveClosure" tooltipText="" outgoingEdges="_Vi5psIKgEeeAppuRs-roLg _YRIxkIKgEeeAppuRs-roLg _mNGgsIKhEeeAppuRs-roLg _sGSk0IKlEeeAppuRs-roLg" width="12" height="10">

       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TransitiveClosure"/>

       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TransitiveClosure"/>

       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

@@ -10063,6 +10079,18 @@
       </ownedStyle>

       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>

     </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_sGSk0IKlEeeAppuRs-roLg" sourceNode="_PQURUIKgEeeAppuRs-roLg" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">

+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TransitiveClosure"/>

+      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//TransitiveClosure/@eGenericSuperTypes.0"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_sGSk0YKlEeeAppuRs-roLg" targetArrow="InputClosedArrow" routingStyle="tree">

+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_sGSk0oKlEeeAppuRs-roLg" showIcon="false">

+          <labelFormat>italic</labelFormat>

+        </beginLabelStyle>

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_sGSk04KlEeeAppuRs-roLg" showIcon="false"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

+    </ownedDiagramElements>

     <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>

     <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_l6Zva7dnEeau1vMV3Bsx4w"/>

     <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 5effb631..aee6cd78 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
@@ -204,7 +204,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="StringLiteral" eSuperTypes="#//AtomicTerm">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="TransitiveClosure">

+  <eClassifiers xsi:type="ecore:EClass" name="TransitiveClosure" eSuperTypes="#//Term">

     <eStructuralFeatures xsi:type="ecore:EReference" name="leftOperand" eType="#//Term"

         containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="rightOperand" eType="#//Term"