From 7b8aa9c1364a555e8e64e19b64e30868dc7358de Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Wed, 16 Aug 2017 19:11:40 +0200 Subject: Transitive closure --- .../logic/model/logiclanguage/LogiclanguagePackage.java | 10 +++++----- .../logic/model/logiclanguage/TransitiveClosure.java | 4 +--- .../model/logiclanguage/impl/LogiclanguagePackageImpl.java | 1 + .../logic/model/logiclanguage/impl/TransitiveClosureImpl.java | 3 +-- .../logic/model/logiclanguage/util/LogiclanguageSwitch.java | 2 ++ 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen') 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 'Right Operand' 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 'Relation' 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 'Transitive Closure' 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 'Transitive Closure' 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; - /** * * A representation of the model object 'Transitive Closure'. @@ -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 'Left Operand' containment reference. * 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; /** * @@ -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() Left Operand}' containment reference. * 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 extends Switch { 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; } -- cgit v1.2.3-54-g00ecf