Transitive closure

8 files changed, 48 insertions, 13 deletions

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguagePackage.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguagePackage.java
index 59bb841a..0e80dc1a 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguagePackage.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguagePackage.java
@@ -2646,7 +2646,7 @@ public interface LogiclanguagePackage extends EPackage {
          * @generated

          * @ordered

          */

-        int TRANSITIVE_CLOSURE__LEFT_OPERAND = 0;

+        int TRANSITIVE_CLOSURE__LEFT_OPERAND = TERM_FEATURE_COUNT + 0;

 

         /**

          * The feature id for the '<em><b>Right Operand</b></em>' containment reference.

@@ -2655,7 +2655,7 @@ public interface LogiclanguagePackage extends EPackage {
          * @generated

          * @ordered

          */

-        int TRANSITIVE_CLOSURE__RIGHT_OPERAND = 1;

+        int TRANSITIVE_CLOSURE__RIGHT_OPERAND = TERM_FEATURE_COUNT + 1;

 

         /**

          * The feature id for the '<em><b>Relation</b></em>' reference.

@@ -2664,7 +2664,7 @@ public interface LogiclanguagePackage extends EPackage {
          * @generated

          * @ordered

          */

-        int TRANSITIVE_CLOSURE__RELATION = 2;

+        int TRANSITIVE_CLOSURE__RELATION = TERM_FEATURE_COUNT + 2;

 

         /**

          * The number of structural features of the '<em>Transitive Closure</em>' class.

@@ -2673,7 +2673,7 @@ public interface LogiclanguagePackage extends EPackage {
          * @generated

          * @ordered

          */

-        int TRANSITIVE_CLOSURE_FEATURE_COUNT = 3;

+        int TRANSITIVE_CLOSURE_FEATURE_COUNT = TERM_FEATURE_COUNT + 3;

 

         /**

          * The number of operations of the '<em>Transitive Closure</em>' class.

@@ -2682,7 +2682,7 @@ public interface LogiclanguagePackage extends EPackage {
          * @generated

          * @ordered

          */

-        int TRANSITIVE_CLOSURE_OPERATION_COUNT = 0;

+        int TRANSITIVE_CLOSURE_OPERATION_COUNT = TERM_OPERATION_COUNT + 0;

 

 

         /**

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/TransitiveClosure.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/TransitiveClosure.java
index 92c80341..ca3da373 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/TransitiveClosure.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/TransitiveClosure.java
@@ -2,8 +2,6 @@
  */

 package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage;

 

-import org.eclipse.emf.ecore.EObject;

-

 /**

  * <!-- begin-user-doc -->

  * A representation of the model object '<em><b>Transitive Closure</b></em>'.

@@ -22,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
  * @model

  * @generated

  */

-public interface TransitiveClosure extends EObject {

+public interface TransitiveClosure extends Term {

         /**

          * Returns the value of the '<em><b>Left Operand</b></em>' containment reference.

          * <!-- begin-user-doc -->

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguagePackageImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguagePackageImpl.java
index 73560344..7e4c4f23 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguagePackageImpl.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguagePackageImpl.java
@@ -1952,6 +1952,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu
                 instanceOfEClass.getESuperTypes().add(this.getTerm());

                 stringTypeReferenceEClass.getESuperTypes().add(this.getPrimitiveTypeReference());

                 stringLiteralEClass.getESuperTypes().add(this.getAtomicTerm());

+                transitiveClosureEClass.getESuperTypes().add(this.getTerm());

 

                 // Initialize classes, features, and operations; add parameters

                 initEClass(typeEClass, Type.class, "Type", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TransitiveClosureImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TransitiveClosureImpl.java
index 9633334b..ecd0eeaf 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TransitiveClosureImpl.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TransitiveClosureImpl.java
@@ -14,7 +14,6 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;

 

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

 

 /**

  * <!-- begin-user-doc -->

@@ -31,7 +30,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  *

  * @generated

  */

-public class TransitiveClosureImpl extends MinimalEObjectImpl.Container implements TransitiveClosure {

+public class TransitiveClosureImpl extends TermImpl implements TransitiveClosure {

         /**

          * The cached value of the '{@link #getLeftOperand() <em>Left Operand</em>}' containment reference.

          * <!-- begin-user-doc -->

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageSwitch.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageSwitch.java
index 74575fb6..07554514 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageSwitch.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageSwitch.java
@@ -547,6 +547,8 @@ public class LogiclanguageSwitch<T> extends Switch<T> {
                         case LogiclanguagePackage.TRANSITIVE_CLOSURE: {

                                 TransitiveClosure transitiveClosure = (TransitiveClosure)theEObject;

                                 T result = caseTransitiveClosure(transitiveClosure);

+                                if (result == null) result = caseTerm(transitiveClosure);

+                                if (result == null) result = caseTermDescription(transitiveClosure);

                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

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"

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend
index d09f77af..ac9781e3 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend
@@ -485,6 +485,13 @@ public class LogicProblemBuilder{
                         it.range = type.toTypeReference

                 ]

         }

+        def public transitiveClosure(Relation relation, TermDescription source, TermDescription target) {

+                createTransitiveClosure => [

+                        it.relation = relation

+                        it.leftOperand = leftOperand

+                        it.rightOperand = rightOperand

+                ]

+        }

         

         // QuantifiedExpressions