Transitive closure

5 files changed, 10 insertions, 10 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;

                         }