diff options
author | 2017-08-16 19:11:40 +0200 | |
---|---|---|
committer | 2017-08-16 19:11:40 +0200 | |
commit | 7b8aa9c1364a555e8e64e19b64e30868dc7358de (patch) | |
tree | 290b1641251004752cba783cea9a7aca92e9fb5b | |
parent | Adding transitive closure to the logic language (diff) | |
download | VIATRA-Generator-7b8aa9c1364a555e8e64e19b64e30868dc7358de.tar.gz VIATRA-Generator-7b8aa9c1364a555e8e64e19b64e30868dc7358de.tar.zst VIATRA-Generator-7b8aa9c1364a555e8e64e19b64e30868dc7358de.zip |
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 { | |||
2646 | * @generated | 2646 | * @generated |
2647 | * @ordered | 2647 | * @ordered |
2648 | */ | 2648 | */ |
2649 | int TRANSITIVE_CLOSURE__LEFT_OPERAND = 0; | 2649 | int TRANSITIVE_CLOSURE__LEFT_OPERAND = TERM_FEATURE_COUNT + 0; |
2650 | 2650 | ||
2651 | /** | 2651 | /** |
2652 | * The feature id for the '<em><b>Right Operand</b></em>' containment reference. | 2652 | * The feature id for the '<em><b>Right Operand</b></em>' containment reference. |
@@ -2655,7 +2655,7 @@ public interface LogiclanguagePackage extends EPackage { | |||
2655 | * @generated | 2655 | * @generated |
2656 | * @ordered | 2656 | * @ordered |
2657 | */ | 2657 | */ |
2658 | int TRANSITIVE_CLOSURE__RIGHT_OPERAND = 1; | 2658 | int TRANSITIVE_CLOSURE__RIGHT_OPERAND = TERM_FEATURE_COUNT + 1; |
2659 | 2659 | ||
2660 | /** | 2660 | /** |
2661 | * The feature id for the '<em><b>Relation</b></em>' reference. | 2661 | * The feature id for the '<em><b>Relation</b></em>' reference. |
@@ -2664,7 +2664,7 @@ public interface LogiclanguagePackage extends EPackage { | |||
2664 | * @generated | 2664 | * @generated |
2665 | * @ordered | 2665 | * @ordered |
2666 | */ | 2666 | */ |
2667 | int TRANSITIVE_CLOSURE__RELATION = 2; | 2667 | int TRANSITIVE_CLOSURE__RELATION = TERM_FEATURE_COUNT + 2; |
2668 | 2668 | ||
2669 | /** | 2669 | /** |
2670 | * The number of structural features of the '<em>Transitive Closure</em>' class. | 2670 | * The number of structural features of the '<em>Transitive Closure</em>' class. |
@@ -2673,7 +2673,7 @@ public interface LogiclanguagePackage extends EPackage { | |||
2673 | * @generated | 2673 | * @generated |
2674 | * @ordered | 2674 | * @ordered |
2675 | */ | 2675 | */ |
2676 | int TRANSITIVE_CLOSURE_FEATURE_COUNT = 3; | 2676 | int TRANSITIVE_CLOSURE_FEATURE_COUNT = TERM_FEATURE_COUNT + 3; |
2677 | 2677 | ||
2678 | /** | 2678 | /** |
2679 | * The number of operations of the '<em>Transitive Closure</em>' class. | 2679 | * The number of operations of the '<em>Transitive Closure</em>' class. |
@@ -2682,7 +2682,7 @@ public interface LogiclanguagePackage extends EPackage { | |||
2682 | * @generated | 2682 | * @generated |
2683 | * @ordered | 2683 | * @ordered |
2684 | */ | 2684 | */ |
2685 | int TRANSITIVE_CLOSURE_OPERATION_COUNT = 0; | 2685 | int TRANSITIVE_CLOSURE_OPERATION_COUNT = TERM_OPERATION_COUNT + 0; |
2686 | 2686 | ||
2687 | 2687 | ||
2688 | /** | 2688 | /** |
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 @@ | |||
2 | */ | 2 | */ |
3 | package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage; | 3 | package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage; |
4 | 4 | ||
5 | import org.eclipse.emf.ecore.EObject; | ||
6 | |||
7 | /** | 5 | /** |
8 | * <!-- begin-user-doc --> | 6 | * <!-- begin-user-doc --> |
9 | * A representation of the model object '<em><b>Transitive Closure</b></em>'. | 7 | * A representation of the model object '<em><b>Transitive Closure</b></em>'. |
@@ -22,7 +20,7 @@ import org.eclipse.emf.ecore.EObject; | |||
22 | * @model | 20 | * @model |
23 | * @generated | 21 | * @generated |
24 | */ | 22 | */ |
25 | public interface TransitiveClosure extends EObject { | 23 | public interface TransitiveClosure extends Term { |
26 | /** | 24 | /** |
27 | * Returns the value of the '<em><b>Left Operand</b></em>' containment reference. | 25 | * Returns the value of the '<em><b>Left Operand</b></em>' containment reference. |
28 | * <!-- begin-user-doc --> | 26 | * <!-- 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 | |||
1952 | instanceOfEClass.getESuperTypes().add(this.getTerm()); | 1952 | instanceOfEClass.getESuperTypes().add(this.getTerm()); |
1953 | stringTypeReferenceEClass.getESuperTypes().add(this.getPrimitiveTypeReference()); | 1953 | stringTypeReferenceEClass.getESuperTypes().add(this.getPrimitiveTypeReference()); |
1954 | stringLiteralEClass.getESuperTypes().add(this.getAtomicTerm()); | 1954 | stringLiteralEClass.getESuperTypes().add(this.getAtomicTerm()); |
1955 | transitiveClosureEClass.getESuperTypes().add(this.getTerm()); | ||
1955 | 1956 | ||
1956 | // Initialize classes, features, and operations; add parameters | 1957 | // Initialize classes, features, and operations; add parameters |
1957 | initEClass(typeEClass, Type.class, "Type", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); | 1958 | 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; | |||
14 | import org.eclipse.emf.ecore.InternalEObject; | 14 | import org.eclipse.emf.ecore.InternalEObject; |
15 | 15 | ||
16 | import org.eclipse.emf.ecore.impl.ENotificationImpl; | 16 | import org.eclipse.emf.ecore.impl.ENotificationImpl; |
17 | import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; | ||
18 | 17 | ||
19 | /** | 18 | /** |
20 | * <!-- begin-user-doc --> | 19 | * <!-- begin-user-doc --> |
@@ -31,7 +30,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; | |||
31 | * | 30 | * |
32 | * @generated | 31 | * @generated |
33 | */ | 32 | */ |
34 | public class TransitiveClosureImpl extends MinimalEObjectImpl.Container implements TransitiveClosure { | 33 | public class TransitiveClosureImpl extends TermImpl implements TransitiveClosure { |
35 | /** | 34 | /** |
36 | * The cached value of the '{@link #getLeftOperand() <em>Left Operand</em>}' containment reference. | 35 | * The cached value of the '{@link #getLeftOperand() <em>Left Operand</em>}' containment reference. |
37 | * <!-- begin-user-doc --> | 36 | * <!-- 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> { | |||
547 | case LogiclanguagePackage.TRANSITIVE_CLOSURE: { | 547 | case LogiclanguagePackage.TRANSITIVE_CLOSURE: { |
548 | TransitiveClosure transitiveClosure = (TransitiveClosure)theEObject; | 548 | TransitiveClosure transitiveClosure = (TransitiveClosure)theEObject; |
549 | T result = caseTransitiveClosure(transitiveClosure); | 549 | T result = caseTransitiveClosure(transitiveClosure); |
550 | if (result == null) result = caseTerm(transitiveClosure); | ||
551 | if (result == null) result = caseTermDescription(transitiveClosure); | ||
550 | if (result == null) result = defaultCase(theEObject); | 552 | if (result == null) result = defaultCase(theEObject); |
551 | return result; | 553 | return result; |
552 | } | 554 | } |
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 @@ | |||
8754 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mN2HmoKhEeeAppuRs-roLg" id="(0.5,0.0)"/> | 8754 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mN2HmoKhEeeAppuRs-roLg" id="(0.5,0.0)"/> |
8755 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mN2Hm4KhEeeAppuRs-roLg" id="(0.3592233009708738,1.0)"/> | 8755 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mN2Hm4KhEeeAppuRs-roLg" id="(0.3592233009708738,1.0)"/> |
8756 | </edges> | 8756 | </edges> |
8757 | <edges xmi:type="notation:Edge" xmi:id="_sHL8sIKlEeeAppuRs-roLg" type="4001" element="_sGSk0IKlEeeAppuRs-roLg" source="_PSQLAIKgEeeAppuRs-roLg" target="_l6XR27dnEeau1vMV3Bsx4w"> | ||
8758 | <children xmi:type="notation:Node" xmi:id="_sHL8tIKlEeeAppuRs-roLg" type="6001"> | ||
8759 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sHL8tYKlEeeAppuRs-roLg" y="-10"/> | ||
8760 | </children> | ||
8761 | <children xmi:type="notation:Node" xmi:id="_sHL8toKlEeeAppuRs-roLg" type="6002"> | ||
8762 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sHL8t4KlEeeAppuRs-roLg" y="10"/> | ||
8763 | </children> | ||
8764 | <children xmi:type="notation:Node" xmi:id="_sHL8uIKlEeeAppuRs-roLg" type="6003"> | ||
8765 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sHL8uYKlEeeAppuRs-roLg" y="10"/> | ||
8766 | </children> | ||
8767 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_sHL8sYKlEeeAppuRs-roLg" routing="Tree"/> | ||
8768 | <styles xmi:type="notation:FontStyle" xmi:id="_sHL8soKlEeeAppuRs-roLg" fontName="Segoe UI" fontHeight="8"/> | ||
8769 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sHL8s4KlEeeAppuRs-roLg" points="[0, 0, 352, 174]$[-352, -174, 0, 0]"/> | ||
8770 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sHL8uoKlEeeAppuRs-roLg" id="(0.0,0.5)"/> | ||
8771 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sHL8u4KlEeeAppuRs-roLg" id="(0.5,1.0)"/> | ||
8772 | </edges> | ||
8757 | </data> | 8773 | </data> |
8758 | </ownedAnnotationEntries> | 8774 | </ownedAnnotationEntries> |
8759 | <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"> | 8775 | <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"> |
8760 | <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Term"/> | 8776 | <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Term"/> |
8761 | <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Term"/> | 8777 | <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Term"/> |
8762 | <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"> | 8778 | <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 @@ | |||
9909 | </ownedStyle> | 9925 | </ownedStyle> |
9910 | <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']"/> | 9926 | <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']"/> |
9911 | </ownedDiagramElements> | 9927 | </ownedDiagramElements> |
9912 | <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_PQURUIKgEeeAppuRs-roLg" name="TransitiveClosure" tooltipText="" outgoingEdges="_Vi5psIKgEeeAppuRs-roLg _YRIxkIKgEeeAppuRs-roLg _mNGgsIKhEeeAppuRs-roLg" width="12" height="10"> | 9928 | <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"> |
9913 | <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TransitiveClosure"/> | 9929 | <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TransitiveClosure"/> |
9914 | <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TransitiveClosure"/> | 9930 | <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TransitiveClosure"/> |
9915 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | 9931 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> |
@@ -10063,6 +10079,18 @@ | |||
10063 | </ownedStyle> | 10079 | </ownedStyle> |
10064 | <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']"/> | 10080 | <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']"/> |
10065 | </ownedDiagramElements> | 10081 | </ownedDiagramElements> |
10082 | <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_sGSk0IKlEeeAppuRs-roLg" sourceNode="_PQURUIKgEeeAppuRs-roLg" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w"> | ||
10083 | <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TransitiveClosure"/> | ||
10084 | <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//TransitiveClosure/@eGenericSuperTypes.0"/> | ||
10085 | <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_sGSk0YKlEeeAppuRs-roLg" targetArrow="InputClosedArrow" routingStyle="tree"> | ||
10086 | <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"/> | ||
10087 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_sGSk0oKlEeeAppuRs-roLg" showIcon="false"> | ||
10088 | <labelFormat>italic</labelFormat> | ||
10089 | </beginLabelStyle> | ||
10090 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_sGSk04KlEeeAppuRs-roLg" showIcon="false"/> | ||
10091 | </ownedStyle> | ||
10092 | <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']"/> | ||
10093 | </ownedDiagramElements> | ||
10066 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> | 10094 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> |
10067 | <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_l6Zva7dnEeau1vMV3Bsx4w"/> | 10095 | <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_l6Zva7dnEeau1vMV3Bsx4w"/> |
10068 | <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/> | 10096 | <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 @@ | |||
204 | <eClassifiers xsi:type="ecore:EClass" name="StringLiteral" eSuperTypes="#//AtomicTerm"> | 204 | <eClassifiers xsi:type="ecore:EClass" name="StringLiteral" eSuperTypes="#//AtomicTerm"> |
205 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> | 205 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> |
206 | </eClassifiers> | 206 | </eClassifiers> |
207 | <eClassifiers xsi:type="ecore:EClass" name="TransitiveClosure"> | 207 | <eClassifiers xsi:type="ecore:EClass" name="TransitiveClosure" eSuperTypes="#//Term"> |
208 | <eStructuralFeatures xsi:type="ecore:EReference" name="leftOperand" eType="#//Term" | 208 | <eStructuralFeatures xsi:type="ecore:EReference" name="leftOperand" eType="#//Term" |
209 | containment="true"/> | 209 | containment="true"/> |
210 | <eStructuralFeatures xsi:type="ecore:EReference" name="rightOperand" eType="#//Term" | 210 | <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{ | |||
485 | it.range = type.toTypeReference | 485 | it.range = type.toTypeReference |
486 | ] | 486 | ] |
487 | } | 487 | } |
488 | def public transitiveClosure(Relation relation, TermDescription source, TermDescription target) { | ||
489 | createTransitiveClosure => [ | ||
490 | it.relation = relation | ||
491 | it.leftOperand = leftOperand | ||
492 | it.rightOperand = rightOperand | ||
493 | ] | ||
494 | } | ||
488 | 495 | ||
489 | // QuantifiedExpressions | 496 | // QuantifiedExpressions |
490 | 497 | ||