From 3e7fdbf562bbb1739a6ff4b09f86f415aaf89a56 Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Sat, 4 May 2019 15:31:47 -0400 Subject: Added aggregate expressions to logic language on the model level --- .../META-INF/MANIFEST.MF | 44 +- .../model/logiclanguage/AggregateExpression.java | 49 + .../logic/model/logiclanguage/Count.java | 17 + .../logic/model/logiclanguage/DefinedElement.java | 2 +- .../logic/model/logiclanguage/Divison.java | 2 +- .../logic/model/logiclanguage/IntOperation.java | 76 - .../model/logiclanguage/LogiclanguageFactory.java | 45 + .../model/logiclanguage/LogiclanguagePackage.java | 579 ++- .../dslreasoner/logic/model/logiclanguage/Max.java | 17 + .../dslreasoner/logic/model/logiclanguage/Min.java | 17 + .../logic/model/logiclanguage/Minus.java | 2 +- .../dslreasoner/logic/model/logiclanguage/Mod.java | 2 +- .../logic/model/logiclanguage/Multiply.java | 2 +- .../model/logiclanguage/NumericOperation.java | 76 + .../logic/model/logiclanguage/Plus.java | 2 +- .../dslreasoner/logic/model/logiclanguage/Pow.java | 17 + .../ProjectedAggregateExpression.java | 50 + .../dslreasoner/logic/model/logiclanguage/Sum.java | 17 + .../impl/AggregateExpressionImpl.java | 158 + .../logic/model/logiclanguage/impl/AndImpl.java | 1 + .../model/logiclanguage/impl/AssertionImpl.java | 7 +- .../model/logiclanguage/impl/BoolLiteralImpl.java | 4 +- .../impl/ComplexTypeReferenceImpl.java | 2 + .../logiclanguage/impl/ConstantDefinitionImpl.java | 4 + .../model/logiclanguage/impl/ConstantImpl.java | 3 + .../logic/model/logiclanguage/impl/CountImpl.java | 37 + .../logiclanguage/impl/DefinedElementImpl.java | 1 + .../model/logiclanguage/impl/DistinctImpl.java | 1 + .../model/logiclanguage/impl/DivisonImpl.java | 2 +- .../logic/model/logiclanguage/impl/EqualsImpl.java | 4 + .../logiclanguage/impl/FunctionDefinitionImpl.java | 5 + .../model/logiclanguage/impl/FunctionImpl.java | 4 + .../model/logiclanguage/impl/IfThenElseImpl.java | 6 + .../logic/model/logiclanguage/impl/IffImpl.java | 4 + .../logic/model/logiclanguage/impl/ImplImpl.java | 4 + .../model/logiclanguage/impl/InstanceOfImpl.java | 4 + .../model/logiclanguage/impl/IntLiteralImpl.java | 4 +- .../model/logiclanguage/impl/IntOperationImpl.java | 241 -- .../logiclanguage/impl/LessOrEqualThanImpl.java | 4 + .../model/logiclanguage/impl/LessThanImpl.java | 4 + .../impl/LogiclanguageFactoryImpl.java | 104 + .../impl/LogiclanguagePackageImpl.java | 362 +- .../logic/model/logiclanguage/impl/MaxImpl.java | 37 + .../logic/model/logiclanguage/impl/MinImpl.java | 37 + .../logic/model/logiclanguage/impl/MinusImpl.java | 2 +- .../logic/model/logiclanguage/impl/ModImpl.java | 2 +- .../logiclanguage/impl/MoreOrEqualThanImpl.java | 4 + .../model/logiclanguage/impl/MoreThanImpl.java | 4 + .../model/logiclanguage/impl/MultiplyImpl.java | 2 +- .../logic/model/logiclanguage/impl/NotImpl.java | 2 + .../logiclanguage/impl/NumericOperationImpl.java | 245 ++ .../logic/model/logiclanguage/impl/OrImpl.java | 1 + .../logic/model/logiclanguage/impl/PlusImpl.java | 2 +- .../logic/model/logiclanguage/impl/PowImpl.java | 37 + .../impl/ProjectedAggregateExpressionImpl.java | 164 + .../impl/QuantifiedExpressionImpl.java | 3 + .../model/logiclanguage/impl/RealLiteralImpl.java | 4 +- .../logiclanguage/impl/RelationDefinitionImpl.java | 5 + .../model/logiclanguage/impl/RelationImpl.java | 2 + .../logiclanguage/impl/StringLiteralImpl.java | 4 +- .../logic/model/logiclanguage/impl/SumImpl.java | 37 + .../impl/SymbolicDeclarationImpl.java | 4 +- .../logiclanguage/impl/SymbolicValueImpl.java | 3 + .../logiclanguage/impl/TransitiveClosureImpl.java | 6 + .../logiclanguage/impl/TypeDefinitionImpl.java | 3 + .../logic/model/logiclanguage/impl/TypeImpl.java | 8 +- .../model/logiclanguage/impl/VariableImpl.java | 2 + .../util/LogiclanguageAdapterFactory.java | 136 +- .../logiclanguage/util/LogiclanguageSwitch.java | 196 +- .../logicproblem/impl/AssertionAnnotationImpl.java | 2 + .../logicproblem/impl/ConstantAnnotationImpl.java | 2 + .../impl/ContainmentHierarchyImpl.java | 5 + .../logicproblem/impl/FunctionAnnotationImpl.java | 2 + .../model/logicproblem/impl/LogicProblemImpl.java | 8 + .../logicproblem/impl/LogicproblemFactoryImpl.java | 8 + .../logicproblem/impl/LogicproblemPackageImpl.java | 36 +- .../logicproblem/impl/RelationAnnotationImpl.java | 2 + .../model/logicresult/impl/ErrorResultImpl.java | 4 +- .../impl/InsuficientResourcesResultImpl.java | 4 +- .../logicresult/impl/IntStatisticEntryImpl.java | 4 +- .../model/logicresult/impl/LogicResultImpl.java | 9 +- .../logicresult/impl/LogicresultFactoryImpl.java | 10 + .../logicresult/impl/LogicresultPackageImpl.java | 41 +- .../model/logicresult/impl/ModelResultImpl.java | 6 +- .../logicresult/impl/RealStatisticEntryImpl.java | 4 +- .../model/logicresult/impl/StatisticEntryImpl.java | 4 +- .../model/logicresult/impl/StatisticsImpl.java | 9 +- .../logicresult/impl/StringStatisticEntryImpl.java | 4 +- .../model/figures/Terms.png | Bin 0 -> 1281575 bytes .../model/logiclanguage.aird | 4181 +++++++++++--------- .../model/logiclanguage.ecore | 26 +- .../model/logiclanguage.genmodel | 30 +- .../model/logicproblem.aird | 230 +- .../model/logicresult.aird | 1464 +++---- 94 files changed, 5903 insertions(+), 3130 deletions(-) create mode 100644 Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/AggregateExpression.java create mode 100644 Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Count.java delete mode 100644 Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/IntOperation.java create mode 100644 Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Max.java create mode 100644 Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Min.java create mode 100644 Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/NumericOperation.java create mode 100644 Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Pow.java create mode 100644 Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/ProjectedAggregateExpression.java create mode 100644 Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Sum.java create mode 100644 Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AggregateExpressionImpl.java create mode 100644 Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/CountImpl.java delete mode 100644 Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IntOperationImpl.java create mode 100644 Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MaxImpl.java create mode 100644 Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MinImpl.java create mode 100644 Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/NumericOperationImpl.java create mode 100644 Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/PowImpl.java create mode 100644 Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ProjectedAggregateExpressionImpl.java create mode 100644 Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/SumImpl.java create mode 100644 Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/figures/Terms.png (limited to 'Framework') diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF index 8e1bba03..338e8c09 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF @@ -7,29 +7,29 @@ Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: hu.bme.mit.inf.dslreasoner.logic.model.builder, - hu.bme.mit.inf.dslreasoner.logic.model.builder.consistencychecker, - hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage, - hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl, - hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.util, - hu.bme.mit.inf.dslreasoner.logic.model.logicproblem, - hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.impl, - hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.util, - hu.bme.mit.inf.dslreasoner.logic.model.logicresult, - hu.bme.mit.inf.dslreasoner.logic.model.logicresult.impl, - hu.bme.mit.inf.dslreasoner.logic.model.logicresult.util, - hu.bme.mit.inf.dslreasoner.logic.model.patterns, - hu.bme.mit.inf.dslreasoner.logic.model.statistics, - hu.bme.mit.inf.dslreasoner.util, - hu.bme.mit.inf.dslreasoner.workspace + hu.bme.mit.inf.dslreasoner.logic.model.builder.consistencychecker, + hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage, + hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl, + hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.util, + hu.bme.mit.inf.dslreasoner.logic.model.logicproblem, + hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.impl, + hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.util, + hu.bme.mit.inf.dslreasoner.logic.model.logicresult, + hu.bme.mit.inf.dslreasoner.logic.model.logicresult.impl, + hu.bme.mit.inf.dslreasoner.logic.model.logicresult.util, + hu.bme.mit.inf.dslreasoner.logic.model.patterns, + hu.bme.mit.inf.dslreasoner.logic.model.statistics, + hu.bme.mit.inf.dslreasoner.util, + hu.bme.mit.inf.dslreasoner.workspace Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore;visibility:=reexport, - com.google.guava, - org.eclipse.xtend.lib, - org.eclipse.xtext.xbase.lib, - org.eclipse.core.resources;bundle-version="3.8.101", - org.eclipse.viatra.query.runtime;bundle-version="1.3.0", - org.apache.commons.lang;bundle-version="2.6.0", - org.eclipse.emf.ecore.xmi;bundle-version="2.13.0" + org.eclipse.emf.ecore;visibility:=reexport, + com.google.guava, + org.eclipse.xtend.lib, + org.eclipse.xtext.xbase.lib, + org.eclipse.core.resources;bundle-version="3.8.101", + org.eclipse.viatra.query.runtime;bundle-version="1.3.0", + org.apache.commons.lang;bundle-version="2.6.0", + org.eclipse.emf.ecore.xmi;bundle-version="2.13.0" Import-Package: org.apache.log4j Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.logic.model Bundle-ActivationPolicy: lazy diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/AggregateExpression.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/AggregateExpression.java new file mode 100644 index 00000000..be146469 --- /dev/null +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/AggregateExpression.java @@ -0,0 +1,49 @@ +/** + */ +package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage; + + +/** + * + * A representation of the model object 'Aggregate Expression'. + * + * + *

+ * The following features are supported: + *

+ * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getAggregateExpression() + * @model abstract="true" + * @generated + */ +public interface AggregateExpression extends Term { + /** + * Returns the value of the 'Relation' reference. + * + *

+ * If the meaning of the 'Relation' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Relation' reference. + * @see #setRelation(Relation) + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getAggregateExpression_Relation() + * @model + * @generated + */ + Relation getRelation(); + + /** + * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.AggregateExpression#getRelation Relation}' reference. + * + * + * @param value the new value of the 'Relation' reference. + * @see #getRelation() + * @generated + */ + void setRelation(Relation value); + +} // AggregateExpression diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Count.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Count.java new file mode 100644 index 00000000..878d6a0c --- /dev/null +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Count.java @@ -0,0 +1,17 @@ +/** + */ +package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage; + + +/** + * + * A representation of the model object 'Count'. + * + * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getCount() + * @model + * @generated + */ +public interface Count extends AggregateExpression { +} // Count diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/DefinedElement.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/DefinedElement.java index d34436d8..9eeed54b 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/DefinedElement.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/DefinedElement.java @@ -36,7 +36,7 @@ public interface DefinedElement extends SymbolicDeclaration { * @return the value of the 'Defined In Type' reference list. * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getDefinedElement_DefinedInType() * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDefinition#getElements - * @model opposite="elements" required="true" + * @model opposite="elements" * @generated */ EList getDefinedInType(); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Divison.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Divison.java index 06c9dd33..96ea4a9a 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Divison.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Divison.java @@ -13,5 +13,5 @@ package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage; * @model * @generated */ -public interface Divison extends IntOperation { +public interface Divison extends NumericOperation { } // Divison diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/IntOperation.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/IntOperation.java deleted file mode 100644 index d9be99e9..00000000 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/IntOperation.java +++ /dev/null @@ -1,76 +0,0 @@ -/** - */ -package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage; - - -/** - * - * A representation of the model object 'Int Operation'. - * - * - *

- * The following features are supported: - *

- * - * - * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getIntOperation() - * @model abstract="true" - * @generated - */ -public interface IntOperation extends Term { - /** - * Returns the value of the 'Left Operand' containment reference. - * - *

- * If the meaning of the 'Left Operand' containment reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Left Operand' containment reference. - * @see #setLeftOperand(Term) - * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getIntOperation_LeftOperand() - * @model containment="true" - * @generated - */ - Term getLeftOperand(); - - /** - * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntOperation#getLeftOperand Left Operand}' containment reference. - * - * - * @param value the new value of the 'Left Operand' containment reference. - * @see #getLeftOperand() - * @generated - */ - void setLeftOperand(Term value); - - /** - * Returns the value of the 'Right Operand' containment reference. - * - *

- * If the meaning of the 'Right Operand' containment reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Right Operand' containment reference. - * @see #setRightOperand(Term) - * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getIntOperation_RightOperand() - * @model containment="true" - * @generated - */ - Term getRightOperand(); - - /** - * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntOperation#getRightOperand Right Operand}' containment reference. - * - * - * @param value the new value of the 'Right Operand' containment reference. - * @see #getRightOperand() - * @generated - */ - void setRightOperand(Term value); - -} // IntOperation diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguageFactory.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguageFactory.java index 57b263aa..a6b0a790 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguageFactory.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguageFactory.java @@ -408,6 +408,51 @@ public interface LogiclanguageFactory extends EFactory { */ TransitiveClosure createTransitiveClosure(); + /** + * Returns a new object of class 'Pow'. + * + * + * @return a new object of class 'Pow'. + * @generated + */ + Pow createPow(); + + /** + * Returns a new object of class 'Sum'. + * + * + * @return a new object of class 'Sum'. + * @generated + */ + Sum createSum(); + + /** + * Returns a new object of class 'Count'. + * + * + * @return a new object of class 'Count'. + * @generated + */ + Count createCount(); + + /** + * Returns a new object of class 'Min'. + * + * + * @return a new object of class 'Min'. + * @generated + */ + Min createMin(); + + /** + * Returns a new object of class 'Max'. + * + * + * @return a new object of class 'Max'. + * @generated + */ + Max createMax(); + /** * Returns the package supported by this factory. * 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 0e80dc1a..ddfb75a2 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 @@ -1506,14 +1506,14 @@ public interface LogiclanguagePackage extends EPackage { int MORE_OR_EQUAL_THAN_OPERATION_COUNT = PRIMITIVE_RELATION_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.IntOperationImpl Int Operation}' class. + * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.NumericOperationImpl Numeric Operation}' class. * * - * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.IntOperationImpl - * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getIntOperation() + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.NumericOperationImpl + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getNumericOperation() * @generated */ - int INT_OPERATION = 34; + int NUMERIC_OPERATION = 34; /** * The feature id for the 'Left Operand' containment reference. @@ -1522,7 +1522,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int INT_OPERATION__LEFT_OPERAND = TERM_FEATURE_COUNT + 0; + int NUMERIC_OPERATION__LEFT_OPERAND = TERM_FEATURE_COUNT + 0; /** * The feature id for the 'Right Operand' containment reference. @@ -1531,25 +1531,25 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int INT_OPERATION__RIGHT_OPERAND = TERM_FEATURE_COUNT + 1; + int NUMERIC_OPERATION__RIGHT_OPERAND = TERM_FEATURE_COUNT + 1; /** - * The number of structural features of the 'Int Operation' class. + * The number of structural features of the 'Numeric Operation' class. * * * @generated * @ordered */ - int INT_OPERATION_FEATURE_COUNT = TERM_FEATURE_COUNT + 2; + int NUMERIC_OPERATION_FEATURE_COUNT = TERM_FEATURE_COUNT + 2; /** - * The number of operations of the 'Int Operation' class. + * The number of operations of the 'Numeric Operation' class. * * * @generated * @ordered */ - int INT_OPERATION_OPERATION_COUNT = TERM_OPERATION_COUNT + 0; + int NUMERIC_OPERATION_OPERATION_COUNT = TERM_OPERATION_COUNT + 0; /** * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.PlusImpl Plus}' class. @@ -1568,7 +1568,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int PLUS__LEFT_OPERAND = INT_OPERATION__LEFT_OPERAND; + int PLUS__LEFT_OPERAND = NUMERIC_OPERATION__LEFT_OPERAND; /** * The feature id for the 'Right Operand' containment reference. @@ -1577,7 +1577,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int PLUS__RIGHT_OPERAND = INT_OPERATION__RIGHT_OPERAND; + int PLUS__RIGHT_OPERAND = NUMERIC_OPERATION__RIGHT_OPERAND; /** * The number of structural features of the 'Plus' class. @@ -1586,7 +1586,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int PLUS_FEATURE_COUNT = INT_OPERATION_FEATURE_COUNT + 0; + int PLUS_FEATURE_COUNT = NUMERIC_OPERATION_FEATURE_COUNT + 0; /** * The number of operations of the 'Plus' class. @@ -1595,7 +1595,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int PLUS_OPERATION_COUNT = INT_OPERATION_OPERATION_COUNT + 0; + int PLUS_OPERATION_COUNT = NUMERIC_OPERATION_OPERATION_COUNT + 0; /** * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.MinusImpl Minus}' class. @@ -1614,7 +1614,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int MINUS__LEFT_OPERAND = INT_OPERATION__LEFT_OPERAND; + int MINUS__LEFT_OPERAND = NUMERIC_OPERATION__LEFT_OPERAND; /** * The feature id for the 'Right Operand' containment reference. @@ -1623,7 +1623,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int MINUS__RIGHT_OPERAND = INT_OPERATION__RIGHT_OPERAND; + int MINUS__RIGHT_OPERAND = NUMERIC_OPERATION__RIGHT_OPERAND; /** * The number of structural features of the 'Minus' class. @@ -1632,7 +1632,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int MINUS_FEATURE_COUNT = INT_OPERATION_FEATURE_COUNT + 0; + int MINUS_FEATURE_COUNT = NUMERIC_OPERATION_FEATURE_COUNT + 0; /** * The number of operations of the 'Minus' class. @@ -1641,7 +1641,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int MINUS_OPERATION_COUNT = INT_OPERATION_OPERATION_COUNT + 0; + int MINUS_OPERATION_COUNT = NUMERIC_OPERATION_OPERATION_COUNT + 0; /** * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.MultiplyImpl Multiply}' class. @@ -1660,7 +1660,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int MULTIPLY__LEFT_OPERAND = INT_OPERATION__LEFT_OPERAND; + int MULTIPLY__LEFT_OPERAND = NUMERIC_OPERATION__LEFT_OPERAND; /** * The feature id for the 'Right Operand' containment reference. @@ -1669,7 +1669,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int MULTIPLY__RIGHT_OPERAND = INT_OPERATION__RIGHT_OPERAND; + int MULTIPLY__RIGHT_OPERAND = NUMERIC_OPERATION__RIGHT_OPERAND; /** * The number of structural features of the 'Multiply' class. @@ -1678,7 +1678,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int MULTIPLY_FEATURE_COUNT = INT_OPERATION_FEATURE_COUNT + 0; + int MULTIPLY_FEATURE_COUNT = NUMERIC_OPERATION_FEATURE_COUNT + 0; /** * The number of operations of the 'Multiply' class. @@ -1687,7 +1687,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int MULTIPLY_OPERATION_COUNT = INT_OPERATION_OPERATION_COUNT + 0; + int MULTIPLY_OPERATION_COUNT = NUMERIC_OPERATION_OPERATION_COUNT + 0; /** * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.DivisonImpl Divison}' class. @@ -1706,7 +1706,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int DIVISON__LEFT_OPERAND = INT_OPERATION__LEFT_OPERAND; + int DIVISON__LEFT_OPERAND = NUMERIC_OPERATION__LEFT_OPERAND; /** * The feature id for the 'Right Operand' containment reference. @@ -1715,7 +1715,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int DIVISON__RIGHT_OPERAND = INT_OPERATION__RIGHT_OPERAND; + int DIVISON__RIGHT_OPERAND = NUMERIC_OPERATION__RIGHT_OPERAND; /** * The number of structural features of the 'Divison' class. @@ -1724,7 +1724,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int DIVISON_FEATURE_COUNT = INT_OPERATION_FEATURE_COUNT + 0; + int DIVISON_FEATURE_COUNT = NUMERIC_OPERATION_FEATURE_COUNT + 0; /** * The number of operations of the 'Divison' class. @@ -1733,7 +1733,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int DIVISON_OPERATION_COUNT = INT_OPERATION_OPERATION_COUNT + 0; + int DIVISON_OPERATION_COUNT = NUMERIC_OPERATION_OPERATION_COUNT + 0; /** * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.ModImpl Mod}' class. @@ -1752,7 +1752,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int MOD__LEFT_OPERAND = INT_OPERATION__LEFT_OPERAND; + int MOD__LEFT_OPERAND = NUMERIC_OPERATION__LEFT_OPERAND; /** * The feature id for the 'Right Operand' containment reference. @@ -1761,7 +1761,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int MOD__RIGHT_OPERAND = INT_OPERATION__RIGHT_OPERAND; + int MOD__RIGHT_OPERAND = NUMERIC_OPERATION__RIGHT_OPERAND; /** * The number of structural features of the 'Mod' class. @@ -1770,7 +1770,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int MOD_FEATURE_COUNT = INT_OPERATION_FEATURE_COUNT + 0; + int MOD_FEATURE_COUNT = NUMERIC_OPERATION_FEATURE_COUNT + 0; /** * The number of operations of the 'Mod' class. @@ -1779,7 +1779,7 @@ public interface LogiclanguagePackage extends EPackage { * @generated * @ordered */ - int MOD_OPERATION_COUNT = INT_OPERATION_OPERATION_COUNT + 0; + int MOD_OPERATION_COUNT = NUMERIC_OPERATION_OPERATION_COUNT + 0; /** * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.AssertionImpl Assertion}' class. @@ -2685,6 +2685,311 @@ public interface LogiclanguagePackage extends EPackage { int TRANSITIVE_CLOSURE_OPERATION_COUNT = TERM_OPERATION_COUNT + 0; + /** + * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.PowImpl Pow}' class. + * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.PowImpl + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getPow() + * @generated + */ + int POW = 58; + + /** + * The feature id for the 'Left Operand' containment reference. + * + * + * @generated + * @ordered + */ + int POW__LEFT_OPERAND = NUMERIC_OPERATION__LEFT_OPERAND; + + /** + * The feature id for the 'Right Operand' containment reference. + * + * + * @generated + * @ordered + */ + int POW__RIGHT_OPERAND = NUMERIC_OPERATION__RIGHT_OPERAND; + + /** + * The number of structural features of the 'Pow' class. + * + * + * @generated + * @ordered + */ + int POW_FEATURE_COUNT = NUMERIC_OPERATION_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Pow' class. + * + * + * @generated + * @ordered + */ + int POW_OPERATION_COUNT = NUMERIC_OPERATION_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.AggregateExpressionImpl Aggregate Expression}' class. + * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.AggregateExpressionImpl + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getAggregateExpression() + * @generated + */ + int AGGREGATE_EXPRESSION = 59; + + /** + * The feature id for the 'Relation' reference. + * + * + * @generated + * @ordered + */ + int AGGREGATE_EXPRESSION__RELATION = TERM_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'Aggregate Expression' class. + * + * + * @generated + * @ordered + */ + int AGGREGATE_EXPRESSION_FEATURE_COUNT = TERM_FEATURE_COUNT + 1; + + /** + * The number of operations of the 'Aggregate Expression' class. + * + * + * @generated + * @ordered + */ + int AGGREGATE_EXPRESSION_OPERATION_COUNT = TERM_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.ProjectedAggregateExpressionImpl Projected Aggregate Expression}' class. + * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.ProjectedAggregateExpressionImpl + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getProjectedAggregateExpression() + * @generated + */ + int PROJECTED_AGGREGATE_EXPRESSION = 64; + + /** + * The feature id for the 'Relation' reference. + * + * + * @generated + * @ordered + */ + int PROJECTED_AGGREGATE_EXPRESSION__RELATION = AGGREGATE_EXPRESSION__RELATION; + + /** + * The feature id for the 'Projection Index' attribute. + * + * + * @generated + * @ordered + */ + int PROJECTED_AGGREGATE_EXPRESSION__PROJECTION_INDEX = AGGREGATE_EXPRESSION_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'Projected Aggregate Expression' class. + * + * + * @generated + * @ordered + */ + int PROJECTED_AGGREGATE_EXPRESSION_FEATURE_COUNT = AGGREGATE_EXPRESSION_FEATURE_COUNT + 1; + + /** + * The number of operations of the 'Projected Aggregate Expression' class. + * + * + * @generated + * @ordered + */ + int PROJECTED_AGGREGATE_EXPRESSION_OPERATION_COUNT = AGGREGATE_EXPRESSION_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.SumImpl Sum}' class. + * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.SumImpl + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getSum() + * @generated + */ + int SUM = 60; + + /** + * The feature id for the 'Relation' reference. + * + * + * @generated + * @ordered + */ + int SUM__RELATION = PROJECTED_AGGREGATE_EXPRESSION__RELATION; + + /** + * The feature id for the 'Projection Index' attribute. + * + * + * @generated + * @ordered + */ + int SUM__PROJECTION_INDEX = PROJECTED_AGGREGATE_EXPRESSION__PROJECTION_INDEX; + + /** + * The number of structural features of the 'Sum' class. + * + * + * @generated + * @ordered + */ + int SUM_FEATURE_COUNT = PROJECTED_AGGREGATE_EXPRESSION_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Sum' class. + * + * + * @generated + * @ordered + */ + int SUM_OPERATION_COUNT = PROJECTED_AGGREGATE_EXPRESSION_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.CountImpl Count}' class. + * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.CountImpl + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getCount() + * @generated + */ + int COUNT = 61; + + /** + * The feature id for the 'Relation' reference. + * + * + * @generated + * @ordered + */ + int COUNT__RELATION = AGGREGATE_EXPRESSION__RELATION; + + /** + * The number of structural features of the 'Count' class. + * + * + * @generated + * @ordered + */ + int COUNT_FEATURE_COUNT = AGGREGATE_EXPRESSION_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Count' class. + * + * + * @generated + * @ordered + */ + int COUNT_OPERATION_COUNT = AGGREGATE_EXPRESSION_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.MinImpl Min}' class. + * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.MinImpl + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getMin() + * @generated + */ + int MIN = 62; + + /** + * The feature id for the 'Relation' reference. + * + * + * @generated + * @ordered + */ + int MIN__RELATION = PROJECTED_AGGREGATE_EXPRESSION__RELATION; + + /** + * The feature id for the 'Projection Index' attribute. + * + * + * @generated + * @ordered + */ + int MIN__PROJECTION_INDEX = PROJECTED_AGGREGATE_EXPRESSION__PROJECTION_INDEX; + + /** + * The number of structural features of the 'Min' class. + * + * + * @generated + * @ordered + */ + int MIN_FEATURE_COUNT = PROJECTED_AGGREGATE_EXPRESSION_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Min' class. + * + * + * @generated + * @ordered + */ + int MIN_OPERATION_COUNT = PROJECTED_AGGREGATE_EXPRESSION_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.MaxImpl Max}' class. + * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.MaxImpl + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getMax() + * @generated + */ + int MAX = 63; + + /** + * The feature id for the 'Relation' reference. + * + * + * @generated + * @ordered + */ + int MAX__RELATION = PROJECTED_AGGREGATE_EXPRESSION__RELATION; + + /** + * The feature id for the 'Projection Index' attribute. + * + * + * @generated + * @ordered + */ + int MAX__PROJECTION_INDEX = PROJECTED_AGGREGATE_EXPRESSION__PROJECTION_INDEX; + + /** + * The number of structural features of the 'Max' class. + * + * + * @generated + * @ordered + */ + int MAX_FEATURE_COUNT = PROJECTED_AGGREGATE_EXPRESSION_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Max' class. + * + * + * @generated + * @ordered + */ + int MAX_OPERATION_COUNT = PROJECTED_AGGREGATE_EXPRESSION_OPERATION_COUNT + 0; + + /** * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type Type}'. * @@ -3444,36 +3749,36 @@ public interface LogiclanguagePackage extends EPackage { EReference getMoreOrEqualThan_RightOperand(); /** - * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntOperation Int Operation}'. + * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.NumericOperation Numeric Operation}'. * * - * @return the meta object for class 'Int Operation'. - * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntOperation + * @return the meta object for class 'Numeric Operation'. + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.NumericOperation * @generated */ - EClass getIntOperation(); + EClass getNumericOperation(); /** - * Returns the meta object for the containment reference '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntOperation#getLeftOperand Left Operand}'. + * Returns the meta object for the containment reference '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.NumericOperation#getLeftOperand Left Operand}'. * * * @return the meta object for the containment reference 'Left Operand'. - * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntOperation#getLeftOperand() - * @see #getIntOperation() + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.NumericOperation#getLeftOperand() + * @see #getNumericOperation() * @generated */ - EReference getIntOperation_LeftOperand(); + EReference getNumericOperation_LeftOperand(); /** - * Returns the meta object for the containment reference '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntOperation#getRightOperand Right Operand}'. + * Returns the meta object for the containment reference '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.NumericOperation#getRightOperand Right Operand}'. * * * @return the meta object for the containment reference 'Right Operand'. - * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntOperation#getRightOperand() - * @see #getIntOperation() + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.NumericOperation#getRightOperand() + * @see #getNumericOperation() * @generated */ - EReference getIntOperation_RightOperand(); + EReference getNumericOperation_RightOperand(); /** * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Plus Plus}'. @@ -3969,6 +4274,98 @@ public interface LogiclanguagePackage extends EPackage { */ EReference getTransitiveClosure_Relation(); + /** + * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Pow Pow}'. + * + * + * @return the meta object for class 'Pow'. + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Pow + * @generated + */ + EClass getPow(); + + /** + * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.AggregateExpression Aggregate Expression}'. + * + * + * @return the meta object for class 'Aggregate Expression'. + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.AggregateExpression + * @generated + */ + EClass getAggregateExpression(); + + /** + * Returns the meta object for the reference '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.AggregateExpression#getRelation Relation}'. + * + * + * @return the meta object for the reference 'Relation'. + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.AggregateExpression#getRelation() + * @see #getAggregateExpression() + * @generated + */ + EReference getAggregateExpression_Relation(); + + /** + * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Sum Sum}'. + * + * + * @return the meta object for class 'Sum'. + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Sum + * @generated + */ + EClass getSum(); + + /** + * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Count Count}'. + * + * + * @return the meta object for class 'Count'. + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Count + * @generated + */ + EClass getCount(); + + /** + * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Min Min}'. + * + * + * @return the meta object for class 'Min'. + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Min + * @generated + */ + EClass getMin(); + + /** + * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Max Max}'. + * + * + * @return the meta object for class 'Max'. + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Max + * @generated + */ + EClass getMax(); + + /** + * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ProjectedAggregateExpression Projected Aggregate Expression}'. + * + * + * @return the meta object for class 'Projected Aggregate Expression'. + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ProjectedAggregateExpression + * @generated + */ + EClass getProjectedAggregateExpression(); + + /** + * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ProjectedAggregateExpression#getProjectionIndex Projection Index}'. + * + * + * @return the meta object for the attribute 'Projection Index'. + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ProjectedAggregateExpression#getProjectionIndex() + * @see #getProjectedAggregateExpression() + * @generated + */ + EAttribute getProjectedAggregateExpression_ProjectionIndex(); + /** * Returns the factory that creates the instances of the model. * @@ -4637,14 +5034,14 @@ public interface LogiclanguagePackage extends EPackage { EReference MORE_OR_EQUAL_THAN__RIGHT_OPERAND = eINSTANCE.getMoreOrEqualThan_RightOperand(); /** - * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.IntOperationImpl Int Operation}' class. + * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.NumericOperationImpl Numeric Operation}' class. * * - * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.IntOperationImpl - * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getIntOperation() + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.NumericOperationImpl + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getNumericOperation() * @generated */ - EClass INT_OPERATION = eINSTANCE.getIntOperation(); + EClass NUMERIC_OPERATION = eINSTANCE.getNumericOperation(); /** * The meta object literal for the 'Left Operand' containment reference feature. @@ -4652,7 +5049,7 @@ public interface LogiclanguagePackage extends EPackage { * * @generated */ - EReference INT_OPERATION__LEFT_OPERAND = eINSTANCE.getIntOperation_LeftOperand(); + EReference NUMERIC_OPERATION__LEFT_OPERAND = eINSTANCE.getNumericOperation_LeftOperand(); /** * The meta object literal for the 'Right Operand' containment reference feature. @@ -4660,7 +5057,7 @@ public interface LogiclanguagePackage extends EPackage { * * @generated */ - EReference INT_OPERATION__RIGHT_OPERAND = eINSTANCE.getIntOperation_RightOperand(); + EReference NUMERIC_OPERATION__RIGHT_OPERAND = eINSTANCE.getNumericOperation_RightOperand(); /** * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.PlusImpl Plus}' class. @@ -5084,6 +5481,92 @@ public interface LogiclanguagePackage extends EPackage { */ EReference TRANSITIVE_CLOSURE__RELATION = eINSTANCE.getTransitiveClosure_Relation(); + /** + * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.PowImpl Pow}' class. + * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.PowImpl + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getPow() + * @generated + */ + EClass POW = eINSTANCE.getPow(); + + /** + * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.AggregateExpressionImpl Aggregate Expression}' class. + * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.AggregateExpressionImpl + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getAggregateExpression() + * @generated + */ + EClass AGGREGATE_EXPRESSION = eINSTANCE.getAggregateExpression(); + + /** + * The meta object literal for the 'Relation' reference feature. + * + * + * @generated + */ + EReference AGGREGATE_EXPRESSION__RELATION = eINSTANCE.getAggregateExpression_Relation(); + + /** + * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.SumImpl Sum}' class. + * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.SumImpl + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getSum() + * @generated + */ + EClass SUM = eINSTANCE.getSum(); + + /** + * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.CountImpl Count}' class. + * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.CountImpl + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getCount() + * @generated + */ + EClass COUNT = eINSTANCE.getCount(); + + /** + * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.MinImpl Min}' class. + * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.MinImpl + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getMin() + * @generated + */ + EClass MIN = eINSTANCE.getMin(); + + /** + * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.MaxImpl Max}' class. + * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.MaxImpl + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getMax() + * @generated + */ + EClass MAX = eINSTANCE.getMax(); + + /** + * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.ProjectedAggregateExpressionImpl Projected Aggregate Expression}' class. + * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.ProjectedAggregateExpressionImpl + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getProjectedAggregateExpression() + * @generated + */ + EClass PROJECTED_AGGREGATE_EXPRESSION = eINSTANCE.getProjectedAggregateExpression(); + + /** + * The meta object literal for the 'Projection Index' attribute feature. + * + * + * @generated + */ + EAttribute PROJECTED_AGGREGATE_EXPRESSION__PROJECTION_INDEX = eINSTANCE.getProjectedAggregateExpression_ProjectionIndex(); + } } //LogiclanguagePackage diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Max.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Max.java new file mode 100644 index 00000000..e2486735 --- /dev/null +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Max.java @@ -0,0 +1,17 @@ +/** + */ +package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage; + + +/** + * + * A representation of the model object 'Max'. + * + * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getMax() + * @model + * @generated + */ +public interface Max extends ProjectedAggregateExpression { +} // Max diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Min.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Min.java new file mode 100644 index 00000000..819c1b94 --- /dev/null +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Min.java @@ -0,0 +1,17 @@ +/** + */ +package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage; + + +/** + * + * A representation of the model object 'Min'. + * + * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getMin() + * @model + * @generated + */ +public interface Min extends ProjectedAggregateExpression { +} // Min diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Minus.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Minus.java index 569818d5..d6487c0c 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Minus.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Minus.java @@ -13,5 +13,5 @@ package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage; * @model * @generated */ -public interface Minus extends IntOperation { +public interface Minus extends NumericOperation { } // Minus diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Mod.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Mod.java index ccd27ec4..7f4b134a 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Mod.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Mod.java @@ -13,5 +13,5 @@ package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage; * @model * @generated */ -public interface Mod extends IntOperation { +public interface Mod extends NumericOperation { } // Mod diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Multiply.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Multiply.java index 250c7d67..c3fb2070 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Multiply.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Multiply.java @@ -13,5 +13,5 @@ package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage; * @model * @generated */ -public interface Multiply extends IntOperation { +public interface Multiply extends NumericOperation { } // Multiply diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/NumericOperation.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/NumericOperation.java new file mode 100644 index 00000000..54002e5a --- /dev/null +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/NumericOperation.java @@ -0,0 +1,76 @@ +/** + */ +package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage; + + +/** + * + * A representation of the model object 'Numeric Operation'. + * + * + *

+ * The following features are supported: + *

+ * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getNumericOperation() + * @model abstract="true" + * @generated + */ +public interface NumericOperation extends Term { + /** + * Returns the value of the 'Left Operand' containment reference. + * + *

+ * If the meaning of the 'Left Operand' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Left Operand' containment reference. + * @see #setLeftOperand(Term) + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getNumericOperation_LeftOperand() + * @model containment="true" + * @generated + */ + Term getLeftOperand(); + + /** + * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.NumericOperation#getLeftOperand Left Operand}' containment reference. + * + * + * @param value the new value of the 'Left Operand' containment reference. + * @see #getLeftOperand() + * @generated + */ + void setLeftOperand(Term value); + + /** + * Returns the value of the 'Right Operand' containment reference. + * + *

+ * If the meaning of the 'Right Operand' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Right Operand' containment reference. + * @see #setRightOperand(Term) + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getNumericOperation_RightOperand() + * @model containment="true" + * @generated + */ + Term getRightOperand(); + + /** + * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.NumericOperation#getRightOperand Right Operand}' containment reference. + * + * + * @param value the new value of the 'Right Operand' containment reference. + * @see #getRightOperand() + * @generated + */ + void setRightOperand(Term value); + +} // NumericOperation diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Plus.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Plus.java index 4e0549b0..1203bd75 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Plus.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Plus.java @@ -13,5 +13,5 @@ package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage; * @model * @generated */ -public interface Plus extends IntOperation { +public interface Plus extends NumericOperation { } // Plus diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Pow.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Pow.java new file mode 100644 index 00000000..c9bf5074 --- /dev/null +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Pow.java @@ -0,0 +1,17 @@ +/** + */ +package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage; + + +/** + * + * A representation of the model object 'Pow'. + * + * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getPow() + * @model + * @generated + */ +public interface Pow extends NumericOperation { +} // Pow diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/ProjectedAggregateExpression.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/ProjectedAggregateExpression.java new file mode 100644 index 00000000..3208e2a4 --- /dev/null +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/ProjectedAggregateExpression.java @@ -0,0 +1,50 @@ +/** + */ +package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage; + + +/** + * + * A representation of the model object 'Projected Aggregate Expression'. + * + * + *

+ * The following features are supported: + *

+ * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getProjectedAggregateExpression() + * @model abstract="true" + * @generated + */ +public interface ProjectedAggregateExpression extends AggregateExpression { + /** + * Returns the value of the 'Projection Index' attribute. + * The default value is "-1". + * + *

+ * If the meaning of the 'Projection Index' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Projection Index' attribute. + * @see #setProjectionIndex(int) + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getProjectedAggregateExpression_ProjectionIndex() + * @model default="-1" required="true" + * @generated + */ + int getProjectionIndex(); + + /** + * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ProjectedAggregateExpression#getProjectionIndex Projection Index}' attribute. + * + * + * @param value the new value of the 'Projection Index' attribute. + * @see #getProjectionIndex() + * @generated + */ + void setProjectionIndex(int value); + +} // ProjectedAggregateExpression diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Sum.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Sum.java new file mode 100644 index 00000000..7cd4d856 --- /dev/null +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/Sum.java @@ -0,0 +1,17 @@ +/** + */ +package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage; + + +/** + * + * A representation of the model object 'Sum'. + * + * + * + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getSum() + * @model + * @generated + */ +public interface Sum extends ProjectedAggregateExpression { +} // Sum diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AggregateExpressionImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AggregateExpressionImpl.java new file mode 100644 index 00000000..fc1420b0 --- /dev/null +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AggregateExpressionImpl.java @@ -0,0 +1,158 @@ +/** + */ +package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl; + +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.AggregateExpression; +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage; +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Relation; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +/** + * + * An implementation of the model object 'Aggregate Expression'. + * + *

+ * The following features are implemented: + *

+ * + * + * @generated + */ +public abstract class AggregateExpressionImpl extends TermImpl implements AggregateExpression { + /** + * The cached value of the '{@link #getRelation() Relation}' reference. + * + * + * @see #getRelation() + * @generated + * @ordered + */ + protected Relation relation; + + /** + * + * + * @generated + */ + protected AggregateExpressionImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LogiclanguagePackage.Literals.AGGREGATE_EXPRESSION; + } + + /** + * + * + * @generated + */ + @Override + public Relation getRelation() { + if (relation != null && relation.eIsProxy()) { + InternalEObject oldRelation = (InternalEObject)relation; + relation = (Relation)eResolveProxy(oldRelation); + if (relation != oldRelation) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, LogiclanguagePackage.AGGREGATE_EXPRESSION__RELATION, oldRelation, relation)); + } + } + return relation; + } + + /** + * + * + * @generated + */ + public Relation basicGetRelation() { + return relation; + } + + /** + * + * + * @generated + */ + @Override + public void setRelation(Relation newRelation) { + Relation oldRelation = relation; + relation = newRelation; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.AGGREGATE_EXPRESSION__RELATION, oldRelation, relation)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case LogiclanguagePackage.AGGREGATE_EXPRESSION__RELATION: + if (resolve) return getRelation(); + return basicGetRelation(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case LogiclanguagePackage.AGGREGATE_EXPRESSION__RELATION: + setRelation((Relation)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case LogiclanguagePackage.AGGREGATE_EXPRESSION__RELATION: + setRelation((Relation)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case LogiclanguagePackage.AGGREGATE_EXPRESSION__RELATION: + return relation != null; + } + return super.eIsSet(featureID); + } + +} //AggregateExpressionImpl diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AndImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AndImpl.java index 1c36b6d6..9d373373 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AndImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AndImpl.java @@ -66,6 +66,7 @@ public class AndImpl extends BoolOperationImpl implements And { * * @generated */ + @Override public EList getOperands() { if (operands == null) { operands = new EObjectContainmentEList(Term.class, this, LogiclanguagePackage.AND__OPERANDS); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AssertionImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AssertionImpl.java index 254f5240..5242fcdb 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AssertionImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AssertionImpl.java @@ -102,6 +102,7 @@ public class AssertionImpl extends MinimalEObjectImpl.Container implements Asser * * @generated */ + @Override public Term getValue() { return value; } @@ -126,6 +127,7 @@ public class AssertionImpl extends MinimalEObjectImpl.Container implements Asser * * @generated */ + @Override public void setValue(Term newValue) { if (newValue != value) { NotificationChain msgs = null; @@ -145,6 +147,7 @@ public class AssertionImpl extends MinimalEObjectImpl.Container implements Asser * * @generated */ + @Override public String getName() { return name; } @@ -154,6 +157,7 @@ public class AssertionImpl extends MinimalEObjectImpl.Container implements Asser * * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -166,6 +170,7 @@ public class AssertionImpl extends MinimalEObjectImpl.Container implements Asser * * @generated */ + @Override public EList getAnnotations() { if (annotations == null) { annotations = new EObjectWithInverseResolvingEList(AssertionAnnotation.class, this, LogiclanguagePackage.ASSERTION__ANNOTATIONS, LogicproblemPackage.ASSERTION_ANNOTATION__TARGET); @@ -293,7 +298,7 @@ public class AssertionImpl extends MinimalEObjectImpl.Container implements Asser public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/BoolLiteralImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/BoolLiteralImpl.java index ea7693bb..b1361e97 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/BoolLiteralImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/BoolLiteralImpl.java @@ -69,6 +69,7 @@ public class BoolLiteralImpl extends AtomicTermImpl implements BoolLiteral { * * @generated */ + @Override public boolean isValue() { return value; } @@ -78,6 +79,7 @@ public class BoolLiteralImpl extends AtomicTermImpl implements BoolLiteral { * * @generated */ + @Override public void setValue(boolean newValue) { boolean oldValue = value; value = newValue; @@ -152,7 +154,7 @@ public class BoolLiteralImpl extends AtomicTermImpl implements BoolLiteral { public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ComplexTypeReferenceImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ComplexTypeReferenceImpl.java index 4473b0be..7618ddbb 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ComplexTypeReferenceImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ComplexTypeReferenceImpl.java @@ -61,6 +61,7 @@ public class ComplexTypeReferenceImpl extends TypeReferenceImpl implements Compl * * @generated */ + @Override public Type getReferred() { if (referred != null && referred.eIsProxy()) { InternalEObject oldReferred = (InternalEObject)referred; @@ -87,6 +88,7 @@ public class ComplexTypeReferenceImpl extends TypeReferenceImpl implements Compl * * @generated */ + @Override public void setReferred(Type newReferred) { Type oldReferred = referred; referred = newReferred; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ConstantDefinitionImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ConstantDefinitionImpl.java index 1114508e..b5195d98 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ConstantDefinitionImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ConstantDefinitionImpl.java @@ -74,6 +74,7 @@ public class ConstantDefinitionImpl extends ConstantImpl implements ConstantDefi * * @generated */ + @Override public Term getValue() { return value; } @@ -98,6 +99,7 @@ public class ConstantDefinitionImpl extends ConstantImpl implements ConstantDefi * * @generated */ + @Override public void setValue(Term newValue) { if (newValue != value) { NotificationChain msgs = null; @@ -117,6 +119,7 @@ public class ConstantDefinitionImpl extends ConstantImpl implements ConstantDefi * * @generated */ + @Override public ConstantDeclaration getDefines() { if (defines != null && defines.eIsProxy()) { InternalEObject oldDefines = (InternalEObject)defines; @@ -143,6 +146,7 @@ public class ConstantDefinitionImpl extends ConstantImpl implements ConstantDefi * * @generated */ + @Override public void setDefines(ConstantDeclaration newDefines) { ConstantDeclaration oldDefines = defines; defines = newDefines; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ConstantImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ConstantImpl.java index 7c34f669..ada4a069 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ConstantImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ConstantImpl.java @@ -79,6 +79,7 @@ public abstract class ConstantImpl extends SymbolicDeclarationImpl implements Co * * @generated */ + @Override public TypeReference getType() { return type; } @@ -103,6 +104,7 @@ public abstract class ConstantImpl extends SymbolicDeclarationImpl implements Co * * @generated */ + @Override public void setType(TypeReference newType) { if (newType != type) { NotificationChain msgs = null; @@ -122,6 +124,7 @@ public abstract class ConstantImpl extends SymbolicDeclarationImpl implements Co * * @generated */ + @Override public EList getAnnotations() { if (annotations == null) { annotations = new EObjectWithInverseResolvingEList(ConstantAnnotation.class, this, LogiclanguagePackage.CONSTANT__ANNOTATIONS, LogicproblemPackage.CONSTANT_ANNOTATION__TARGET); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/CountImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/CountImpl.java new file mode 100644 index 00000000..a40bd0c4 --- /dev/null +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/CountImpl.java @@ -0,0 +1,37 @@ +/** + */ +package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl; + +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Count; +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Count'. + * + * + * @generated + */ +public class CountImpl extends AggregateExpressionImpl implements Count { + /** + * + * + * @generated + */ + protected CountImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LogiclanguagePackage.Literals.COUNT; + } + +} //CountImpl diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DefinedElementImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DefinedElementImpl.java index 50bdb003..7c78d010 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DefinedElementImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DefinedElementImpl.java @@ -62,6 +62,7 @@ public class DefinedElementImpl extends SymbolicDeclarationImpl implements Defin * * @generated */ + @Override public EList getDefinedInType() { if (definedInType == null) { definedInType = new EObjectWithInverseResolvingEList.ManyInverse(TypeDefinition.class, this, LogiclanguagePackage.DEFINED_ELEMENT__DEFINED_IN_TYPE, LogiclanguagePackage.TYPE_DEFINITION__ELEMENTS); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DistinctImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DistinctImpl.java index 04636b3d..4d674fdc 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DistinctImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DistinctImpl.java @@ -66,6 +66,7 @@ public class DistinctImpl extends PrimitiveRelationImpl implements Distinct { * * @generated */ + @Override public EList getOperands() { if (operands == null) { operands = new EObjectContainmentEList(Term.class, this, LogiclanguagePackage.DISTINCT__OPERANDS); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DivisonImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DivisonImpl.java index 0ce40588..4dc1b536 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DivisonImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DivisonImpl.java @@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.EClass; * * @generated */ -public class DivisonImpl extends IntOperationImpl implements Divison { +public class DivisonImpl extends NumericOperationImpl implements Divison { /** * * diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/EqualsImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/EqualsImpl.java index 186f2ee6..10268d4f 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/EqualsImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/EqualsImpl.java @@ -73,6 +73,7 @@ public class EqualsImpl extends PrimitiveRelationImpl implements Equals { * * @generated */ + @Override public Term getLeftOperand() { return leftOperand; } @@ -97,6 +98,7 @@ public class EqualsImpl extends PrimitiveRelationImpl implements Equals { * * @generated */ + @Override public void setLeftOperand(Term newLeftOperand) { if (newLeftOperand != leftOperand) { NotificationChain msgs = null; @@ -116,6 +118,7 @@ public class EqualsImpl extends PrimitiveRelationImpl implements Equals { * * @generated */ + @Override public Term getRightOperand() { return rightOperand; } @@ -140,6 +143,7 @@ public class EqualsImpl extends PrimitiveRelationImpl implements Equals { * * @generated */ + @Override public void setRightOperand(Term newRightOperand) { if (newRightOperand != rightOperand) { NotificationChain msgs = null; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/FunctionDefinitionImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/FunctionDefinitionImpl.java index 0f14289a..b142d8c5 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/FunctionDefinitionImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/FunctionDefinitionImpl.java @@ -90,6 +90,7 @@ public class FunctionDefinitionImpl extends FunctionImpl implements FunctionDefi * * @generated */ + @Override public EList getVariable() { if (variable == null) { variable = new EObjectContainmentEList(Variable.class, this, LogiclanguagePackage.FUNCTION_DEFINITION__VARIABLE); @@ -102,6 +103,7 @@ public class FunctionDefinitionImpl extends FunctionImpl implements FunctionDefi * * @generated */ + @Override public FunctionDeclaration getDefines() { if (defines != null && defines.eIsProxy()) { InternalEObject oldDefines = (InternalEObject)defines; @@ -128,6 +130,7 @@ public class FunctionDefinitionImpl extends FunctionImpl implements FunctionDefi * * @generated */ + @Override public void setDefines(FunctionDeclaration newDefines) { FunctionDeclaration oldDefines = defines; defines = newDefines; @@ -140,6 +143,7 @@ public class FunctionDefinitionImpl extends FunctionImpl implements FunctionDefi * * @generated */ + @Override public Term getValue() { return value; } @@ -164,6 +168,7 @@ public class FunctionDefinitionImpl extends FunctionImpl implements FunctionDefi * * @generated */ + @Override public void setValue(Term newValue) { if (newValue != value) { NotificationChain msgs = null; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/FunctionImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/FunctionImpl.java index da85ae54..e2c59dc5 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/FunctionImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/FunctionImpl.java @@ -94,6 +94,7 @@ public abstract class FunctionImpl extends SymbolicDeclarationImpl implements Fu * * @generated */ + @Override public TypeReference getRange() { return range; } @@ -118,6 +119,7 @@ public abstract class FunctionImpl extends SymbolicDeclarationImpl implements Fu * * @generated */ + @Override public void setRange(TypeReference newRange) { if (newRange != range) { NotificationChain msgs = null; @@ -137,6 +139,7 @@ public abstract class FunctionImpl extends SymbolicDeclarationImpl implements Fu * * @generated */ + @Override public EList getParameters() { if (parameters == null) { parameters = new EObjectContainmentEList(TypeReference.class, this, LogiclanguagePackage.FUNCTION__PARAMETERS); @@ -149,6 +152,7 @@ public abstract class FunctionImpl extends SymbolicDeclarationImpl implements Fu * * @generated */ + @Override public EList getAnnotations() { if (annotations == null) { annotations = new EObjectWithInverseResolvingEList(FunctionAnnotation.class, this, LogiclanguagePackage.FUNCTION__ANNOTATIONS, LogicproblemPackage.FUNCTION_ANNOTATION__TARGET); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IfThenElseImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IfThenElseImpl.java index 27f1a358..e37bf40a 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IfThenElseImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IfThenElseImpl.java @@ -84,6 +84,7 @@ public class IfThenElseImpl extends TermImpl implements IfThenElse { * * @generated */ + @Override public Term getCondition() { return condition; } @@ -108,6 +109,7 @@ public class IfThenElseImpl extends TermImpl implements IfThenElse { * * @generated */ + @Override public void setCondition(Term newCondition) { if (newCondition != condition) { NotificationChain msgs = null; @@ -127,6 +129,7 @@ public class IfThenElseImpl extends TermImpl implements IfThenElse { * * @generated */ + @Override public Term getIfTrue() { return ifTrue; } @@ -151,6 +154,7 @@ public class IfThenElseImpl extends TermImpl implements IfThenElse { * * @generated */ + @Override public void setIfTrue(Term newIfTrue) { if (newIfTrue != ifTrue) { NotificationChain msgs = null; @@ -170,6 +174,7 @@ public class IfThenElseImpl extends TermImpl implements IfThenElse { * * @generated */ + @Override public Term getIfFalse() { return ifFalse; } @@ -194,6 +199,7 @@ public class IfThenElseImpl extends TermImpl implements IfThenElse { * * @generated */ + @Override public void setIfFalse(Term newIfFalse) { if (newIfFalse != ifFalse) { NotificationChain msgs = null; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IffImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IffImpl.java index 52c80e4a..82529047 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IffImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IffImpl.java @@ -73,6 +73,7 @@ public class IffImpl extends BoolOperationImpl implements Iff { * * @generated */ + @Override public Term getLeftOperand() { return leftOperand; } @@ -97,6 +98,7 @@ public class IffImpl extends BoolOperationImpl implements Iff { * * @generated */ + @Override public void setLeftOperand(Term newLeftOperand) { if (newLeftOperand != leftOperand) { NotificationChain msgs = null; @@ -116,6 +118,7 @@ public class IffImpl extends BoolOperationImpl implements Iff { * * @generated */ + @Override public Term getRightOperand() { return rightOperand; } @@ -140,6 +143,7 @@ public class IffImpl extends BoolOperationImpl implements Iff { * * @generated */ + @Override public void setRightOperand(Term newRightOperand) { if (newRightOperand != rightOperand) { NotificationChain msgs = null; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ImplImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ImplImpl.java index af915e5d..8a93fa37 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ImplImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ImplImpl.java @@ -73,6 +73,7 @@ public class ImplImpl extends BoolOperationImpl implements Impl { * * @generated */ + @Override public Term getLeftOperand() { return leftOperand; } @@ -97,6 +98,7 @@ public class ImplImpl extends BoolOperationImpl implements Impl { * * @generated */ + @Override public void setLeftOperand(Term newLeftOperand) { if (newLeftOperand != leftOperand) { NotificationChain msgs = null; @@ -116,6 +118,7 @@ public class ImplImpl extends BoolOperationImpl implements Impl { * * @generated */ + @Override public Term getRightOperand() { return rightOperand; } @@ -140,6 +143,7 @@ public class ImplImpl extends BoolOperationImpl implements Impl { * * @generated */ + @Override public void setRightOperand(Term newRightOperand) { if (newRightOperand != rightOperand) { NotificationChain msgs = null; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/InstanceOfImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/InstanceOfImpl.java index 9d36b076..dec38397 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/InstanceOfImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/InstanceOfImpl.java @@ -74,6 +74,7 @@ public class InstanceOfImpl extends TermImpl implements InstanceOf { * * @generated */ + @Override public Term getValue() { return value; } @@ -98,6 +99,7 @@ public class InstanceOfImpl extends TermImpl implements InstanceOf { * * @generated */ + @Override public void setValue(Term newValue) { if (newValue != value) { NotificationChain msgs = null; @@ -117,6 +119,7 @@ public class InstanceOfImpl extends TermImpl implements InstanceOf { * * @generated */ + @Override public TypeReference getRange() { return range; } @@ -141,6 +144,7 @@ public class InstanceOfImpl extends TermImpl implements InstanceOf { * * @generated */ + @Override public void setRange(TypeReference newRange) { if (newRange != range) { NotificationChain msgs = null; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IntLiteralImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IntLiteralImpl.java index c0ec1001..19acfe5a 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IntLiteralImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IntLiteralImpl.java @@ -69,6 +69,7 @@ public class IntLiteralImpl extends AtomicTermImpl implements IntLiteral { * * @generated */ + @Override public int getValue() { return value; } @@ -78,6 +79,7 @@ public class IntLiteralImpl extends AtomicTermImpl implements IntLiteral { * * @generated */ + @Override public void setValue(int newValue) { int oldValue = value; value = newValue; @@ -152,7 +154,7 @@ public class IntLiteralImpl extends AtomicTermImpl implements IntLiteral { public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IntOperationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IntOperationImpl.java deleted file mode 100644 index dab1f9ec..00000000 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IntOperationImpl.java +++ /dev/null @@ -1,241 +0,0 @@ -/** - */ -package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl; - -import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntOperation; -import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage; -import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; - -/** - * - * An implementation of the model object 'Int Operation'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.IntOperationImpl#getLeftOperand Left Operand}
    • - *
  • {@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.IntOperationImpl#getRightOperand Right Operand}
    • - *
- * - * @generated - */ -public abstract class IntOperationImpl extends TermImpl implements IntOperation { - /** - * The cached value of the '{@link #getLeftOperand() Left Operand}' containment reference. - * - * - * @see #getLeftOperand() - * @generated - * @ordered - */ - protected Term leftOperand; - - /** - * The cached value of the '{@link #getRightOperand() Right Operand}' containment reference. - * - * - * @see #getRightOperand() - * @generated - * @ordered - */ - protected Term rightOperand; - - /** - * - * - * @generated - */ - protected IntOperationImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return LogiclanguagePackage.Literals.INT_OPERATION; - } - - /** - * - * - * @generated - */ - public Term getLeftOperand() { - return leftOperand; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetLeftOperand(Term newLeftOperand, NotificationChain msgs) { - Term oldLeftOperand = leftOperand; - leftOperand = newLeftOperand; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.INT_OPERATION__LEFT_OPERAND, oldLeftOperand, newLeftOperand); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setLeftOperand(Term newLeftOperand) { - if (newLeftOperand != leftOperand) { - NotificationChain msgs = null; - if (leftOperand != null) - msgs = ((InternalEObject)leftOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.INT_OPERATION__LEFT_OPERAND, null, msgs); - if (newLeftOperand != null) - msgs = ((InternalEObject)newLeftOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.INT_OPERATION__LEFT_OPERAND, null, msgs); - msgs = basicSetLeftOperand(newLeftOperand, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.INT_OPERATION__LEFT_OPERAND, newLeftOperand, newLeftOperand)); - } - - /** - * - * - * @generated - */ - public Term getRightOperand() { - return rightOperand; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetRightOperand(Term newRightOperand, NotificationChain msgs) { - Term oldRightOperand = rightOperand; - rightOperand = newRightOperand; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.INT_OPERATION__RIGHT_OPERAND, oldRightOperand, newRightOperand); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setRightOperand(Term newRightOperand) { - if (newRightOperand != rightOperand) { - NotificationChain msgs = null; - if (rightOperand != null) - msgs = ((InternalEObject)rightOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.INT_OPERATION__RIGHT_OPERAND, null, msgs); - if (newRightOperand != null) - msgs = ((InternalEObject)newRightOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.INT_OPERATION__RIGHT_OPERAND, null, msgs); - msgs = basicSetRightOperand(newRightOperand, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.INT_OPERATION__RIGHT_OPERAND, newRightOperand, newRightOperand)); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case LogiclanguagePackage.INT_OPERATION__LEFT_OPERAND: - return basicSetLeftOperand(null, msgs); - case LogiclanguagePackage.INT_OPERATION__RIGHT_OPERAND: - return basicSetRightOperand(null, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case LogiclanguagePackage.INT_OPERATION__LEFT_OPERAND: - return getLeftOperand(); - case LogiclanguagePackage.INT_OPERATION__RIGHT_OPERAND: - return getRightOperand(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case LogiclanguagePackage.INT_OPERATION__LEFT_OPERAND: - setLeftOperand((Term)newValue); - return; - case LogiclanguagePackage.INT_OPERATION__RIGHT_OPERAND: - setRightOperand((Term)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case LogiclanguagePackage.INT_OPERATION__LEFT_OPERAND: - setLeftOperand((Term)null); - return; - case LogiclanguagePackage.INT_OPERATION__RIGHT_OPERAND: - setRightOperand((Term)null); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case LogiclanguagePackage.INT_OPERATION__LEFT_OPERAND: - return leftOperand != null; - case LogiclanguagePackage.INT_OPERATION__RIGHT_OPERAND: - return rightOperand != null; - } - return super.eIsSet(featureID); - } - -} //IntOperationImpl diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LessOrEqualThanImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LessOrEqualThanImpl.java index 4213ad37..9d5d64a2 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LessOrEqualThanImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LessOrEqualThanImpl.java @@ -73,6 +73,7 @@ public class LessOrEqualThanImpl extends PrimitiveRelationImpl implements LessOr * * @generated */ + @Override public Term getLeftOperand() { return leftOperand; } @@ -97,6 +98,7 @@ public class LessOrEqualThanImpl extends PrimitiveRelationImpl implements LessOr * * @generated */ + @Override public void setLeftOperand(Term newLeftOperand) { if (newLeftOperand != leftOperand) { NotificationChain msgs = null; @@ -116,6 +118,7 @@ public class LessOrEqualThanImpl extends PrimitiveRelationImpl implements LessOr * * @generated */ + @Override public Term getRightOperand() { return rightOperand; } @@ -140,6 +143,7 @@ public class LessOrEqualThanImpl extends PrimitiveRelationImpl implements LessOr * * @generated */ + @Override public void setRightOperand(Term newRightOperand) { if (newRightOperand != rightOperand) { NotificationChain msgs = null; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LessThanImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LessThanImpl.java index 8a36abdd..2bb11e0a 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LessThanImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LessThanImpl.java @@ -73,6 +73,7 @@ public class LessThanImpl extends PrimitiveRelationImpl implements LessThan { * * @generated */ + @Override public Term getLeftOperand() { return leftOperand; } @@ -97,6 +98,7 @@ public class LessThanImpl extends PrimitiveRelationImpl implements LessThan { * * @generated */ + @Override public void setLeftOperand(Term newLeftOperand) { if (newLeftOperand != leftOperand) { NotificationChain msgs = null; @@ -116,6 +118,7 @@ public class LessThanImpl extends PrimitiveRelationImpl implements LessThan { * * @generated */ + @Override public Term getRightOperand() { return rightOperand; } @@ -140,6 +143,7 @@ public class LessThanImpl extends PrimitiveRelationImpl implements LessThan { * * @generated */ + @Override public void setRightOperand(Term newRightOperand) { if (newRightOperand != rightOperand) { NotificationChain msgs = null; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguageFactoryImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguageFactoryImpl.java index 0ad07f55..b890b6e0 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguageFactoryImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguageFactoryImpl.java @@ -99,6 +99,11 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu case LogiclanguagePackage.STRING_TYPE_REFERENCE: return createStringTypeReference(); case LogiclanguagePackage.STRING_LITERAL: return createStringLiteral(); case LogiclanguagePackage.TRANSITIVE_CLOSURE: return createTransitiveClosure(); + case LogiclanguagePackage.POW: return createPow(); + case LogiclanguagePackage.SUM: return createSum(); + case LogiclanguagePackage.COUNT: return createCount(); + case LogiclanguagePackage.MIN: return createMin(); + case LogiclanguagePackage.MAX: return createMax(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -109,6 +114,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public DefinedElement createDefinedElement() { DefinedElementImpl definedElement = new DefinedElementImpl(); return definedElement; @@ -119,6 +125,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public TypeDefinition createTypeDefinition() { TypeDefinitionImpl typeDefinition = new TypeDefinitionImpl(); return typeDefinition; @@ -129,6 +136,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public ComplexTypeReference createComplexTypeReference() { ComplexTypeReferenceImpl complexTypeReference = new ComplexTypeReferenceImpl(); return complexTypeReference; @@ -139,6 +147,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public IntTypeReference createIntTypeReference() { IntTypeReferenceImpl intTypeReference = new IntTypeReferenceImpl(); return intTypeReference; @@ -149,6 +158,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public BoolTypeReference createBoolTypeReference() { BoolTypeReferenceImpl boolTypeReference = new BoolTypeReferenceImpl(); return boolTypeReference; @@ -159,6 +169,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public RealTypeReference createRealTypeReference() { RealTypeReferenceImpl realTypeReference = new RealTypeReferenceImpl(); return realTypeReference; @@ -169,6 +180,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public SymbolicValue createSymbolicValue() { SymbolicValueImpl symbolicValue = new SymbolicValueImpl(); return symbolicValue; @@ -179,6 +191,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public IntLiteral createIntLiteral() { IntLiteralImpl intLiteral = new IntLiteralImpl(); return intLiteral; @@ -189,6 +202,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public BoolLiteral createBoolLiteral() { BoolLiteralImpl boolLiteral = new BoolLiteralImpl(); return boolLiteral; @@ -199,6 +213,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public RealLiteral createRealLiteral() { RealLiteralImpl realLiteral = new RealLiteralImpl(); return realLiteral; @@ -209,6 +224,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public Variable createVariable() { VariableImpl variable = new VariableImpl(); return variable; @@ -219,6 +235,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public Exists createExists() { ExistsImpl exists = new ExistsImpl(); return exists; @@ -229,6 +246,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public Forall createForall() { ForallImpl forall = new ForallImpl(); return forall; @@ -239,6 +257,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public And createAnd() { AndImpl and = new AndImpl(); return and; @@ -249,6 +268,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public Or createOr() { OrImpl or = new OrImpl(); return or; @@ -259,6 +279,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public Impl createImpl() { ImplImpl impl = new ImplImpl(); return impl; @@ -269,6 +290,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public Not createNot() { NotImpl not = new NotImpl(); return not; @@ -279,6 +301,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public Iff createIff() { IffImpl iff = new IffImpl(); return iff; @@ -289,6 +312,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public Equals createEquals() { EqualsImpl equals = new EqualsImpl(); return equals; @@ -299,6 +323,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public Distinct createDistinct() { DistinctImpl distinct = new DistinctImpl(); return distinct; @@ -309,6 +334,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public LessThan createLessThan() { LessThanImpl lessThan = new LessThanImpl(); return lessThan; @@ -319,6 +345,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public MoreThan createMoreThan() { MoreThanImpl moreThan = new MoreThanImpl(); return moreThan; @@ -329,6 +356,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public LessOrEqualThan createLessOrEqualThan() { LessOrEqualThanImpl lessOrEqualThan = new LessOrEqualThanImpl(); return lessOrEqualThan; @@ -339,6 +367,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public MoreOrEqualThan createMoreOrEqualThan() { MoreOrEqualThanImpl moreOrEqualThan = new MoreOrEqualThanImpl(); return moreOrEqualThan; @@ -349,6 +378,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public Plus createPlus() { PlusImpl plus = new PlusImpl(); return plus; @@ -359,6 +389,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public Minus createMinus() { MinusImpl minus = new MinusImpl(); return minus; @@ -369,6 +400,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public Multiply createMultiply() { MultiplyImpl multiply = new MultiplyImpl(); return multiply; @@ -379,6 +411,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public Divison createDivison() { DivisonImpl divison = new DivisonImpl(); return divison; @@ -389,6 +422,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public Mod createMod() { ModImpl mod = new ModImpl(); return mod; @@ -399,6 +433,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public Assertion createAssertion() { AssertionImpl assertion = new AssertionImpl(); return assertion; @@ -409,6 +444,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public ConstantDefinition createConstantDefinition() { ConstantDefinitionImpl constantDefinition = new ConstantDefinitionImpl(); return constantDefinition; @@ -419,6 +455,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public RelationDefinition createRelationDefinition() { RelationDefinitionImpl relationDefinition = new RelationDefinitionImpl(); return relationDefinition; @@ -429,6 +466,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public FunctionDefinition createFunctionDefinition() { FunctionDefinitionImpl functionDefinition = new FunctionDefinitionImpl(); return functionDefinition; @@ -439,6 +477,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public IfThenElse createIfThenElse() { IfThenElseImpl ifThenElse = new IfThenElseImpl(); return ifThenElse; @@ -449,6 +488,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public ConstantDeclaration createConstantDeclaration() { ConstantDeclarationImpl constantDeclaration = new ConstantDeclarationImpl(); return constantDeclaration; @@ -459,6 +499,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public RelationDeclaration createRelationDeclaration() { RelationDeclarationImpl relationDeclaration = new RelationDeclarationImpl(); return relationDeclaration; @@ -469,6 +510,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public FunctionDeclaration createFunctionDeclaration() { FunctionDeclarationImpl functionDeclaration = new FunctionDeclarationImpl(); return functionDeclaration; @@ -479,6 +521,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public TypeDeclaration createTypeDeclaration() { TypeDeclarationImpl typeDeclaration = new TypeDeclarationImpl(); return typeDeclaration; @@ -489,6 +532,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public UnknownBecauseUninterpreted createUnknownBecauseUninterpreted() { UnknownBecauseUninterpretedImpl unknownBecauseUninterpreted = new UnknownBecauseUninterpretedImpl(); return unknownBecauseUninterpreted; @@ -499,6 +543,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public InstanceOf createInstanceOf() { InstanceOfImpl instanceOf = new InstanceOfImpl(); return instanceOf; @@ -509,6 +554,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public StringTypeReference createStringTypeReference() { StringTypeReferenceImpl stringTypeReference = new StringTypeReferenceImpl(); return stringTypeReference; @@ -519,6 +565,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public StringLiteral createStringLiteral() { StringLiteralImpl stringLiteral = new StringLiteralImpl(); return stringLiteral; @@ -529,6 +576,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override public TransitiveClosure createTransitiveClosure() { TransitiveClosureImpl transitiveClosure = new TransitiveClosureImpl(); return transitiveClosure; @@ -539,6 +587,62 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu * * @generated */ + @Override + public Pow createPow() { + PowImpl pow = new PowImpl(); + return pow; + } + + /** + * + * + * @generated + */ + @Override + public Sum createSum() { + SumImpl sum = new SumImpl(); + return sum; + } + + /** + * + * + * @generated + */ + @Override + public Count createCount() { + CountImpl count = new CountImpl(); + return count; + } + + /** + * + * + * @generated + */ + @Override + public Min createMin() { + MinImpl min = new MinImpl(); + return min; + } + + /** + * + * + * @generated + */ + @Override + public Max createMax() { + MaxImpl max = new MaxImpl(); + return max; + } + + /** + * + * + * @generated + */ + @Override public LogiclanguagePackage getLogiclanguagePackage() { return (LogiclanguagePackage)getEPackage(); } 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 7e4c4f23..6d370c0f 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 @@ -2,6 +2,7 @@ */ package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl; +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.AggregateExpression; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.And; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Assertion; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.AtomicTerm; @@ -12,6 +13,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ComplexTypeReference import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Constant; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ConstantDeclaration; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ConstantDefinition; +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Count; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Distinct; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Divison; @@ -26,22 +28,26 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Iff; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Impl; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.InstanceOf; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntLiteral; -import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntOperation; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntTypeReference; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LessOrEqualThan; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LessThan; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguageFactory; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage; +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Max; +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Min; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Minus; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Mod; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.MoreOrEqualThan; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.MoreThan; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Multiply; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Not; +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.NumericOperation; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Or; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Plus; +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Pow; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.PrimitiveRelation; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.PrimitiveTypeReference; +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ProjectedAggregateExpression; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.QuantifiedExpression; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RealLiteral; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RealTypeReference; @@ -50,6 +56,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDefinition; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.StringLiteral; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.StringTypeReference; +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Sum; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.SymbolicDeclaration; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.SymbolicValue; import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term; @@ -328,7 +335,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ - private EClass intOperationEClass = null; + private EClass numericOperationEClass = null; /** * @@ -491,6 +498,55 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu */ private EClass transitiveClosureEClass = null; + /** + * + * + * @generated + */ + private EClass powEClass = null; + + /** + * + * + * @generated + */ + private EClass aggregateExpressionEClass = null; + + /** + * + * + * @generated + */ + private EClass sumEClass = null; + + /** + * + * + * @generated + */ + private EClass countEClass = null; + + /** + * + * + * @generated + */ + private EClass minEClass = null; + + /** + * + * + * @generated + */ + private EClass maxEClass = null; + + /** + * + * + * @generated + */ + private EClass projectedAggregateExpressionEClass = null; + /** * Creates an instance of the model Package, registered with * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package @@ -519,7 +575,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link LogiclanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -533,13 +589,16 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu if (isInited) return (LogiclanguagePackage)EPackage.Registry.INSTANCE.getEPackage(LogiclanguagePackage.eNS_URI); // Obtain or create and register package - LogiclanguagePackageImpl theLogiclanguagePackage = (LogiclanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LogiclanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LogiclanguagePackageImpl()); + Object registeredLogiclanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LogiclanguagePackageImpl theLogiclanguagePackage = registeredLogiclanguagePackage instanceof LogiclanguagePackageImpl ? (LogiclanguagePackageImpl)registeredLogiclanguagePackage : new LogiclanguagePackageImpl(); isInited = true; // Obtain or create and register interdependencies - LogicproblemPackageImpl theLogicproblemPackage = (LogicproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LogicproblemPackage.eNS_URI) instanceof LogicproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LogicproblemPackage.eNS_URI) : LogicproblemPackage.eINSTANCE); - LogicresultPackageImpl theLogicresultPackage = (LogicresultPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LogicresultPackage.eNS_URI) instanceof LogicresultPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LogicresultPackage.eNS_URI) : LogicresultPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LogicproblemPackage.eNS_URI); + LogicproblemPackageImpl theLogicproblemPackage = (LogicproblemPackageImpl)(registeredPackage instanceof LogicproblemPackageImpl ? registeredPackage : LogicproblemPackage.eINSTANCE); + registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LogicresultPackage.eNS_URI); + LogicresultPackageImpl theLogicresultPackage = (LogicresultPackageImpl)(registeredPackage instanceof LogicresultPackageImpl ? registeredPackage : LogicresultPackage.eINSTANCE); // Create package meta-data objects theLogiclanguagePackage.createPackageContents(); @@ -554,7 +613,6 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu // Mark meta-data to indicate it can't be changed theLogiclanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(LogiclanguagePackage.eNS_URI, theLogiclanguagePackage); return theLogiclanguagePackage; @@ -565,6 +623,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getType() { return typeEClass; } @@ -574,6 +633,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EAttribute getType_Name() { return (EAttribute)typeEClass.getEStructuralFeatures().get(0); } @@ -583,6 +643,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getType_Subtypes() { return (EReference)typeEClass.getEStructuralFeatures().get(1); } @@ -592,6 +653,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getType_Supertypes() { return (EReference)typeEClass.getEStructuralFeatures().get(2); } @@ -601,6 +663,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EAttribute getType_IsAbstract() { return (EAttribute)typeEClass.getEStructuralFeatures().get(3); } @@ -610,6 +673,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getDefinedElement() { return definedElementEClass; } @@ -619,6 +683,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getDefinedElement_DefinedInType() { return (EReference)definedElementEClass.getEStructuralFeatures().get(0); } @@ -628,6 +693,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getTypeDefinition() { return typeDefinitionEClass; } @@ -637,6 +703,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getTypeDefinition_Elements() { return (EReference)typeDefinitionEClass.getEStructuralFeatures().get(0); } @@ -646,6 +713,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getTypeDefinition_Defines() { return (EReference)typeDefinitionEClass.getEStructuralFeatures().get(1); } @@ -655,6 +723,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getTypeReference() { return typeReferenceEClass; } @@ -664,6 +733,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getComplexTypeReference() { return complexTypeReferenceEClass; } @@ -673,6 +743,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getComplexTypeReference_Referred() { return (EReference)complexTypeReferenceEClass.getEStructuralFeatures().get(0); } @@ -682,6 +753,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getPrimitiveTypeReference() { return primitiveTypeReferenceEClass; } @@ -691,6 +763,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getIntTypeReference() { return intTypeReferenceEClass; } @@ -700,6 +773,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getBoolTypeReference() { return boolTypeReferenceEClass; } @@ -709,6 +783,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getRealTypeReference() { return realTypeReferenceEClass; } @@ -718,6 +793,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getFunction() { return functionEClass; } @@ -727,6 +803,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getFunction_Range() { return (EReference)functionEClass.getEStructuralFeatures().get(0); } @@ -736,6 +813,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getFunction_Parameters() { return (EReference)functionEClass.getEStructuralFeatures().get(1); } @@ -745,6 +823,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getFunction_Annotations() { return (EReference)functionEClass.getEStructuralFeatures().get(2); } @@ -754,6 +833,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getTerm() { return termEClass; } @@ -763,6 +843,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getSymbolicDeclaration() { return symbolicDeclarationEClass; } @@ -772,6 +853,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EAttribute getSymbolicDeclaration_Name() { return (EAttribute)symbolicDeclarationEClass.getEStructuralFeatures().get(0); } @@ -781,6 +863,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getSymbolicValue() { return symbolicValueEClass; } @@ -790,6 +873,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getSymbolicValue_SymbolicReference() { return (EReference)symbolicValueEClass.getEStructuralFeatures().get(0); } @@ -799,6 +883,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getSymbolicValue_ParameterSubstitutions() { return (EReference)symbolicValueEClass.getEStructuralFeatures().get(1); } @@ -808,6 +893,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getAtomicTerm() { return atomicTermEClass; } @@ -817,6 +903,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getIntLiteral() { return intLiteralEClass; } @@ -826,6 +913,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EAttribute getIntLiteral_Value() { return (EAttribute)intLiteralEClass.getEStructuralFeatures().get(0); } @@ -835,6 +923,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getBoolLiteral() { return boolLiteralEClass; } @@ -844,6 +933,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EAttribute getBoolLiteral_Value() { return (EAttribute)boolLiteralEClass.getEStructuralFeatures().get(0); } @@ -853,6 +943,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getRealLiteral() { return realLiteralEClass; } @@ -862,6 +953,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EAttribute getRealLiteral_Value() { return (EAttribute)realLiteralEClass.getEStructuralFeatures().get(0); } @@ -871,6 +963,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getVariable() { return variableEClass; } @@ -880,6 +973,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getVariable_Range() { return (EReference)variableEClass.getEStructuralFeatures().get(0); } @@ -889,6 +983,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getQuantifiedExpression() { return quantifiedExpressionEClass; } @@ -898,6 +993,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getQuantifiedExpression_QuantifiedVariables() { return (EReference)quantifiedExpressionEClass.getEStructuralFeatures().get(0); } @@ -907,6 +1003,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getQuantifiedExpression_Expression() { return (EReference)quantifiedExpressionEClass.getEStructuralFeatures().get(1); } @@ -916,6 +1013,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getExists() { return existsEClass; } @@ -925,6 +1023,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getForall() { return forallEClass; } @@ -934,6 +1033,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getBoolOperation() { return boolOperationEClass; } @@ -943,6 +1043,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getAnd() { return andEClass; } @@ -952,6 +1053,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getAnd_Operands() { return (EReference)andEClass.getEStructuralFeatures().get(0); } @@ -961,6 +1063,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getOr() { return orEClass; } @@ -970,6 +1073,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getOr_Operands() { return (EReference)orEClass.getEStructuralFeatures().get(0); } @@ -979,6 +1083,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getImpl() { return implEClass; } @@ -988,6 +1093,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getImpl_LeftOperand() { return (EReference)implEClass.getEStructuralFeatures().get(0); } @@ -997,6 +1103,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getImpl_RightOperand() { return (EReference)implEClass.getEStructuralFeatures().get(1); } @@ -1006,6 +1113,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getNot() { return notEClass; } @@ -1015,6 +1123,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getNot_Operand() { return (EReference)notEClass.getEStructuralFeatures().get(0); } @@ -1024,6 +1133,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getIff() { return iffEClass; } @@ -1033,6 +1143,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getIff_LeftOperand() { return (EReference)iffEClass.getEStructuralFeatures().get(0); } @@ -1042,6 +1153,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getIff_RightOperand() { return (EReference)iffEClass.getEStructuralFeatures().get(1); } @@ -1051,6 +1163,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getPrimitiveRelation() { return primitiveRelationEClass; } @@ -1060,6 +1173,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getEquals() { return equalsEClass; } @@ -1069,6 +1183,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getEquals_LeftOperand() { return (EReference)equalsEClass.getEStructuralFeatures().get(0); } @@ -1078,6 +1193,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getEquals_RightOperand() { return (EReference)equalsEClass.getEStructuralFeatures().get(1); } @@ -1087,6 +1203,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getDistinct() { return distinctEClass; } @@ -1096,6 +1213,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getDistinct_Operands() { return (EReference)distinctEClass.getEStructuralFeatures().get(0); } @@ -1105,6 +1223,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getLessThan() { return lessThanEClass; } @@ -1114,6 +1233,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getLessThan_LeftOperand() { return (EReference)lessThanEClass.getEStructuralFeatures().get(0); } @@ -1123,6 +1243,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getLessThan_RightOperand() { return (EReference)lessThanEClass.getEStructuralFeatures().get(1); } @@ -1132,6 +1253,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getMoreThan() { return moreThanEClass; } @@ -1141,6 +1263,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getMoreThan_LeftOperand() { return (EReference)moreThanEClass.getEStructuralFeatures().get(0); } @@ -1150,6 +1273,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getMoreThan_RightOperand() { return (EReference)moreThanEClass.getEStructuralFeatures().get(1); } @@ -1159,6 +1283,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getLessOrEqualThan() { return lessOrEqualThanEClass; } @@ -1168,6 +1293,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getLessOrEqualThan_LeftOperand() { return (EReference)lessOrEqualThanEClass.getEStructuralFeatures().get(0); } @@ -1177,6 +1303,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getLessOrEqualThan_RightOperand() { return (EReference)lessOrEqualThanEClass.getEStructuralFeatures().get(1); } @@ -1186,6 +1313,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getMoreOrEqualThan() { return moreOrEqualThanEClass; } @@ -1195,6 +1323,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getMoreOrEqualThan_LeftOperand() { return (EReference)moreOrEqualThanEClass.getEStructuralFeatures().get(0); } @@ -1204,6 +1333,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getMoreOrEqualThan_RightOperand() { return (EReference)moreOrEqualThanEClass.getEStructuralFeatures().get(1); } @@ -1213,8 +1343,9 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ - public EClass getIntOperation() { - return intOperationEClass; + @Override + public EClass getNumericOperation() { + return numericOperationEClass; } /** @@ -1222,8 +1353,9 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ - public EReference getIntOperation_LeftOperand() { - return (EReference)intOperationEClass.getEStructuralFeatures().get(0); + @Override + public EReference getNumericOperation_LeftOperand() { + return (EReference)numericOperationEClass.getEStructuralFeatures().get(0); } /** @@ -1231,8 +1363,9 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ - public EReference getIntOperation_RightOperand() { - return (EReference)intOperationEClass.getEStructuralFeatures().get(1); + @Override + public EReference getNumericOperation_RightOperand() { + return (EReference)numericOperationEClass.getEStructuralFeatures().get(1); } /** @@ -1240,6 +1373,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getPlus() { return plusEClass; } @@ -1249,6 +1383,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getMinus() { return minusEClass; } @@ -1258,6 +1393,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getMultiply() { return multiplyEClass; } @@ -1267,6 +1403,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getDivison() { return divisonEClass; } @@ -1276,6 +1413,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getMod() { return modEClass; } @@ -1285,6 +1423,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getTypeDescriptor() { return typeDescriptorEClass; } @@ -1294,6 +1433,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getTermDescription() { return termDescriptionEClass; } @@ -1303,6 +1443,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getAssertion() { return assertionEClass; } @@ -1312,6 +1453,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getAssertion_Value() { return (EReference)assertionEClass.getEStructuralFeatures().get(0); } @@ -1321,6 +1463,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EAttribute getAssertion_Name() { return (EAttribute)assertionEClass.getEStructuralFeatures().get(1); } @@ -1330,6 +1473,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getAssertion_Annotations() { return (EReference)assertionEClass.getEStructuralFeatures().get(2); } @@ -1339,6 +1483,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getRelation() { return relationEClass; } @@ -1348,6 +1493,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getRelation_Parameters() { return (EReference)relationEClass.getEStructuralFeatures().get(0); } @@ -1357,6 +1503,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getRelation_Annotations() { return (EReference)relationEClass.getEStructuralFeatures().get(1); } @@ -1366,6 +1513,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getConstant() { return constantEClass; } @@ -1375,6 +1523,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getConstant_Type() { return (EReference)constantEClass.getEStructuralFeatures().get(0); } @@ -1384,6 +1533,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getConstant_Annotations() { return (EReference)constantEClass.getEStructuralFeatures().get(1); } @@ -1393,6 +1543,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getConstantDefinition() { return constantDefinitionEClass; } @@ -1402,6 +1553,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getConstantDefinition_Value() { return (EReference)constantDefinitionEClass.getEStructuralFeatures().get(0); } @@ -1411,6 +1563,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getConstantDefinition_Defines() { return (EReference)constantDefinitionEClass.getEStructuralFeatures().get(1); } @@ -1420,6 +1573,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getRelationDefinition() { return relationDefinitionEClass; } @@ -1429,6 +1583,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getRelationDefinition_Variables() { return (EReference)relationDefinitionEClass.getEStructuralFeatures().get(0); } @@ -1438,6 +1593,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getRelationDefinition_Value() { return (EReference)relationDefinitionEClass.getEStructuralFeatures().get(1); } @@ -1447,6 +1603,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getRelationDefinition_Defines() { return (EReference)relationDefinitionEClass.getEStructuralFeatures().get(2); } @@ -1456,6 +1613,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getFunctionDefinition() { return functionDefinitionEClass; } @@ -1465,6 +1623,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getFunctionDefinition_Variable() { return (EReference)functionDefinitionEClass.getEStructuralFeatures().get(0); } @@ -1474,6 +1633,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getFunctionDefinition_Defines() { return (EReference)functionDefinitionEClass.getEStructuralFeatures().get(1); } @@ -1483,6 +1643,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getFunctionDefinition_Value() { return (EReference)functionDefinitionEClass.getEStructuralFeatures().get(2); } @@ -1492,6 +1653,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getIfThenElse() { return ifThenElseEClass; } @@ -1501,6 +1663,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getIfThenElse_Condition() { return (EReference)ifThenElseEClass.getEStructuralFeatures().get(0); } @@ -1510,6 +1673,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getIfThenElse_IfTrue() { return (EReference)ifThenElseEClass.getEStructuralFeatures().get(1); } @@ -1519,6 +1683,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getIfThenElse_IfFalse() { return (EReference)ifThenElseEClass.getEStructuralFeatures().get(2); } @@ -1528,6 +1693,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getConstantDeclaration() { return constantDeclarationEClass; } @@ -1537,6 +1703,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getRelationDeclaration() { return relationDeclarationEClass; } @@ -1546,6 +1713,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getFunctionDeclaration() { return functionDeclarationEClass; } @@ -1555,6 +1723,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getTypeDeclaration() { return typeDeclarationEClass; } @@ -1564,6 +1733,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getUnknownBecauseUninterpreted() { return unknownBecauseUninterpretedEClass; } @@ -1573,6 +1743,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getInstanceOf() { return instanceOfEClass; } @@ -1582,6 +1753,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getInstanceOf_Value() { return (EReference)instanceOfEClass.getEStructuralFeatures().get(0); } @@ -1591,6 +1763,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getInstanceOf_Range() { return (EReference)instanceOfEClass.getEStructuralFeatures().get(1); } @@ -1600,6 +1773,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getStringTypeReference() { return stringTypeReferenceEClass; } @@ -1609,6 +1783,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getStringLiteral() { return stringLiteralEClass; } @@ -1618,6 +1793,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EAttribute getStringLiteral_Value() { return (EAttribute)stringLiteralEClass.getEStructuralFeatures().get(0); } @@ -1627,6 +1803,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EClass getTransitiveClosure() { return transitiveClosureEClass; } @@ -1636,6 +1813,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getTransitiveClosure_LeftOperand() { return (EReference)transitiveClosureEClass.getEStructuralFeatures().get(0); } @@ -1645,6 +1823,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getTransitiveClosure_RightOperand() { return (EReference)transitiveClosureEClass.getEStructuralFeatures().get(1); } @@ -1654,6 +1833,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override public EReference getTransitiveClosure_Relation() { return (EReference)transitiveClosureEClass.getEStructuralFeatures().get(2); } @@ -1663,6 +1843,97 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu * * @generated */ + @Override + public EClass getPow() { + return powEClass; + } + + /** + * + * + * @generated + */ + @Override + public EClass getAggregateExpression() { + return aggregateExpressionEClass; + } + + /** + * + * + * @generated + */ + @Override + public EReference getAggregateExpression_Relation() { + return (EReference)aggregateExpressionEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + @Override + public EClass getSum() { + return sumEClass; + } + + /** + * + * + * @generated + */ + @Override + public EClass getCount() { + return countEClass; + } + + /** + * + * + * @generated + */ + @Override + public EClass getMin() { + return minEClass; + } + + /** + * + * + * @generated + */ + @Override + public EClass getMax() { + return maxEClass; + } + + /** + * + * + * @generated + */ + @Override + public EClass getProjectedAggregateExpression() { + return projectedAggregateExpressionEClass; + } + + /** + * + * + * @generated + */ + @Override + public EAttribute getProjectedAggregateExpression_ProjectionIndex() { + return (EAttribute)projectedAggregateExpressionEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + @Override public LogiclanguageFactory getLogiclanguageFactory() { return (LogiclanguageFactory)getEFactoryInstance(); } @@ -1792,9 +2063,9 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu createEReference(moreOrEqualThanEClass, MORE_OR_EQUAL_THAN__LEFT_OPERAND); createEReference(moreOrEqualThanEClass, MORE_OR_EQUAL_THAN__RIGHT_OPERAND); - intOperationEClass = createEClass(INT_OPERATION); - createEReference(intOperationEClass, INT_OPERATION__LEFT_OPERAND); - createEReference(intOperationEClass, INT_OPERATION__RIGHT_OPERAND); + numericOperationEClass = createEClass(NUMERIC_OPERATION); + createEReference(numericOperationEClass, NUMERIC_OPERATION__LEFT_OPERAND); + createEReference(numericOperationEClass, NUMERIC_OPERATION__RIGHT_OPERAND); plusEClass = createEClass(PLUS); @@ -1865,6 +2136,22 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu createEReference(transitiveClosureEClass, TRANSITIVE_CLOSURE__LEFT_OPERAND); createEReference(transitiveClosureEClass, TRANSITIVE_CLOSURE__RIGHT_OPERAND); createEReference(transitiveClosureEClass, TRANSITIVE_CLOSURE__RELATION); + + powEClass = createEClass(POW); + + aggregateExpressionEClass = createEClass(AGGREGATE_EXPRESSION); + createEReference(aggregateExpressionEClass, AGGREGATE_EXPRESSION__RELATION); + + sumEClass = createEClass(SUM); + + countEClass = createEClass(COUNT); + + minEClass = createEClass(MIN); + + maxEClass = createEClass(MAX); + + projectedAggregateExpressionEClass = createEClass(PROJECTED_AGGREGATE_EXPRESSION); + createEAttribute(projectedAggregateExpressionEClass, PROJECTED_AGGREGATE_EXPRESSION__PROJECTION_INDEX); } /** @@ -1932,12 +2219,12 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu moreThanEClass.getESuperTypes().add(this.getPrimitiveRelation()); lessOrEqualThanEClass.getESuperTypes().add(this.getPrimitiveRelation()); moreOrEqualThanEClass.getESuperTypes().add(this.getPrimitiveRelation()); - intOperationEClass.getESuperTypes().add(this.getTerm()); - plusEClass.getESuperTypes().add(this.getIntOperation()); - minusEClass.getESuperTypes().add(this.getIntOperation()); - multiplyEClass.getESuperTypes().add(this.getIntOperation()); - divisonEClass.getESuperTypes().add(this.getIntOperation()); - modEClass.getESuperTypes().add(this.getIntOperation()); + numericOperationEClass.getESuperTypes().add(this.getTerm()); + plusEClass.getESuperTypes().add(this.getNumericOperation()); + minusEClass.getESuperTypes().add(this.getNumericOperation()); + multiplyEClass.getESuperTypes().add(this.getNumericOperation()); + divisonEClass.getESuperTypes().add(this.getNumericOperation()); + modEClass.getESuperTypes().add(this.getNumericOperation()); relationEClass.getESuperTypes().add(this.getSymbolicDeclaration()); constantEClass.getESuperTypes().add(this.getSymbolicDeclaration()); constantDefinitionEClass.getESuperTypes().add(this.getConstant()); @@ -1953,6 +2240,13 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu stringTypeReferenceEClass.getESuperTypes().add(this.getPrimitiveTypeReference()); stringLiteralEClass.getESuperTypes().add(this.getAtomicTerm()); transitiveClosureEClass.getESuperTypes().add(this.getTerm()); + powEClass.getESuperTypes().add(this.getNumericOperation()); + aggregateExpressionEClass.getESuperTypes().add(this.getTerm()); + sumEClass.getESuperTypes().add(this.getProjectedAggregateExpression()); + countEClass.getESuperTypes().add(this.getAggregateExpression()); + minEClass.getESuperTypes().add(this.getProjectedAggregateExpression()); + maxEClass.getESuperTypes().add(this.getProjectedAggregateExpression()); + projectedAggregateExpressionEClass.getESuperTypes().add(this.getAggregateExpression()); // Initialize classes, features, and operations; add parameters initEClass(typeEClass, Type.class, "Type", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -1962,7 +2256,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu initEAttribute(getType_IsAbstract(), ecorePackage.getEBoolean(), "isAbstract", null, 1, 1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(definedElementEClass, DefinedElement.class, "DefinedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getDefinedElement_DefinedInType(), this.getTypeDefinition(), this.getTypeDefinition_Elements(), "definedInType", null, 1, -1, DefinedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getDefinedElement_DefinedInType(), this.getTypeDefinition(), this.getTypeDefinition_Elements(), "definedInType", null, 0, -1, DefinedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(typeDefinitionEClass, TypeDefinition.class, "TypeDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getTypeDefinition_Elements(), this.getDefinedElement(), this.getDefinedElement_DefinedInType(), "elements", null, 0, -1, TypeDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -2061,9 +2355,9 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu initEReference(getMoreOrEqualThan_LeftOperand(), this.getTerm(), null, "leftOperand", null, 0, 1, MoreOrEqualThan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getMoreOrEqualThan_RightOperand(), this.getTerm(), null, "rightOperand", null, 0, 1, MoreOrEqualThan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(intOperationEClass, IntOperation.class, "IntOperation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIntOperation_LeftOperand(), this.getTerm(), null, "leftOperand", null, 0, 1, IntOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getIntOperation_RightOperand(), this.getTerm(), null, "rightOperand", null, 0, 1, IntOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(numericOperationEClass, NumericOperation.class, "NumericOperation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getNumericOperation_LeftOperand(), this.getTerm(), null, "leftOperand", null, 0, 1, NumericOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getNumericOperation_RightOperand(), this.getTerm(), null, "rightOperand", null, 0, 1, NumericOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(plusEClass, Plus.class, "Plus", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -2135,6 +2429,22 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu initEReference(getTransitiveClosure_RightOperand(), this.getTerm(), null, "rightOperand", null, 0, 1, TransitiveClosure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getTransitiveClosure_Relation(), this.getRelation(), null, "relation", null, 0, 1, TransitiveClosure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(powEClass, Pow.class, "Pow", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(aggregateExpressionEClass, AggregateExpression.class, "AggregateExpression", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getAggregateExpression_Relation(), this.getRelation(), null, "relation", null, 0, 1, AggregateExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(sumEClass, Sum.class, "Sum", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(countEClass, Count.class, "Count", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(minEClass, Min.class, "Min", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(maxEClass, Max.class, "Max", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(projectedAggregateExpressionEClass, ProjectedAggregateExpression.class, "ProjectedAggregateExpression", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getProjectedAggregateExpression_ProjectionIndex(), ecorePackage.getEInt(), "projectionIndex", "-1", 1, 1, ProjectedAggregateExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + // Create resource createResource(eNS_URI); } diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MaxImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MaxImpl.java new file mode 100644 index 00000000..b2e79b09 --- /dev/null +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MaxImpl.java @@ -0,0 +1,37 @@ +/** + */ +package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl; + +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage; +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Max; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Max'. + * + * + * @generated + */ +public class MaxImpl extends ProjectedAggregateExpressionImpl implements Max { + /** + * + * + * @generated + */ + protected MaxImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LogiclanguagePackage.Literals.MAX; + } + +} //MaxImpl diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MinImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MinImpl.java new file mode 100644 index 00000000..3e1e0a12 --- /dev/null +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MinImpl.java @@ -0,0 +1,37 @@ +/** + */ +package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl; + +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage; +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Min; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Min'. + * + * + * @generated + */ +public class MinImpl extends ProjectedAggregateExpressionImpl implements Min { + /** + * + * + * @generated + */ + protected MinImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LogiclanguagePackage.Literals.MIN; + } + +} //MinImpl diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MinusImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MinusImpl.java index 28c21b08..711f75f3 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MinusImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MinusImpl.java @@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.EClass; * * @generated */ -public class MinusImpl extends IntOperationImpl implements Minus { +public class MinusImpl extends NumericOperationImpl implements Minus { /** * * diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ModImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ModImpl.java index bab8d326..16001dc6 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ModImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ModImpl.java @@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.EClass; * * @generated */ -public class ModImpl extends IntOperationImpl implements Mod { +public class ModImpl extends NumericOperationImpl implements Mod { /** * * diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MoreOrEqualThanImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MoreOrEqualThanImpl.java index 8ebf0ccf..89856c61 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MoreOrEqualThanImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MoreOrEqualThanImpl.java @@ -73,6 +73,7 @@ public class MoreOrEqualThanImpl extends PrimitiveRelationImpl implements MoreOr * * @generated */ + @Override public Term getLeftOperand() { return leftOperand; } @@ -97,6 +98,7 @@ public class MoreOrEqualThanImpl extends PrimitiveRelationImpl implements MoreOr * * @generated */ + @Override public void setLeftOperand(Term newLeftOperand) { if (newLeftOperand != leftOperand) { NotificationChain msgs = null; @@ -116,6 +118,7 @@ public class MoreOrEqualThanImpl extends PrimitiveRelationImpl implements MoreOr * * @generated */ + @Override public Term getRightOperand() { return rightOperand; } @@ -140,6 +143,7 @@ public class MoreOrEqualThanImpl extends PrimitiveRelationImpl implements MoreOr * * @generated */ + @Override public void setRightOperand(Term newRightOperand) { if (newRightOperand != rightOperand) { NotificationChain msgs = null; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MoreThanImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MoreThanImpl.java index a7756650..4f3ecbbd 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MoreThanImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MoreThanImpl.java @@ -73,6 +73,7 @@ public class MoreThanImpl extends PrimitiveRelationImpl implements MoreThan { * * @generated */ + @Override public Term getLeftOperand() { return leftOperand; } @@ -97,6 +98,7 @@ public class MoreThanImpl extends PrimitiveRelationImpl implements MoreThan { * * @generated */ + @Override public void setLeftOperand(Term newLeftOperand) { if (newLeftOperand != leftOperand) { NotificationChain msgs = null; @@ -116,6 +118,7 @@ public class MoreThanImpl extends PrimitiveRelationImpl implements MoreThan { * * @generated */ + @Override public Term getRightOperand() { return rightOperand; } @@ -140,6 +143,7 @@ public class MoreThanImpl extends PrimitiveRelationImpl implements MoreThan { * * @generated */ + @Override public void setRightOperand(Term newRightOperand) { if (newRightOperand != rightOperand) { NotificationChain msgs = null; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MultiplyImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MultiplyImpl.java index 50797800..59cbd129 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MultiplyImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MultiplyImpl.java @@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.EClass; * * @generated */ -public class MultiplyImpl extends IntOperationImpl implements Multiply { +public class MultiplyImpl extends NumericOperationImpl implements Multiply { /** * * diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/NotImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/NotImpl.java index 74c4dd6f..0c280139 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/NotImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/NotImpl.java @@ -62,6 +62,7 @@ public class NotImpl extends BoolOperationImpl implements Not { * * @generated */ + @Override public Term getOperand() { return operand; } @@ -86,6 +87,7 @@ public class NotImpl extends BoolOperationImpl implements Not { * * @generated */ + @Override public void setOperand(Term newOperand) { if (newOperand != operand) { NotificationChain msgs = null; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/NumericOperationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/NumericOperationImpl.java new file mode 100644 index 00000000..4e46b43a --- /dev/null +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/NumericOperationImpl.java @@ -0,0 +1,245 @@ +/** + */ +package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl; + +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage; +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.NumericOperation; +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +/** + * + * An implementation of the model object 'Numeric Operation'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.NumericOperationImpl#getLeftOperand Left Operand}
    • + *
  • {@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.NumericOperationImpl#getRightOperand Right Operand}
    • + *
+ * + * @generated + */ +public abstract class NumericOperationImpl extends TermImpl implements NumericOperation { + /** + * The cached value of the '{@link #getLeftOperand() Left Operand}' containment reference. + * + * + * @see #getLeftOperand() + * @generated + * @ordered + */ + protected Term leftOperand; + + /** + * The cached value of the '{@link #getRightOperand() Right Operand}' containment reference. + * + * + * @see #getRightOperand() + * @generated + * @ordered + */ + protected Term rightOperand; + + /** + * + * + * @generated + */ + protected NumericOperationImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LogiclanguagePackage.Literals.NUMERIC_OPERATION; + } + + /** + * + * + * @generated + */ + @Override + public Term getLeftOperand() { + return leftOperand; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetLeftOperand(Term newLeftOperand, NotificationChain msgs) { + Term oldLeftOperand = leftOperand; + leftOperand = newLeftOperand; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.NUMERIC_OPERATION__LEFT_OPERAND, oldLeftOperand, newLeftOperand); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + @Override + public void setLeftOperand(Term newLeftOperand) { + if (newLeftOperand != leftOperand) { + NotificationChain msgs = null; + if (leftOperand != null) + msgs = ((InternalEObject)leftOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.NUMERIC_OPERATION__LEFT_OPERAND, null, msgs); + if (newLeftOperand != null) + msgs = ((InternalEObject)newLeftOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.NUMERIC_OPERATION__LEFT_OPERAND, null, msgs); + msgs = basicSetLeftOperand(newLeftOperand, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.NUMERIC_OPERATION__LEFT_OPERAND, newLeftOperand, newLeftOperand)); + } + + /** + * + * + * @generated + */ + @Override + public Term getRightOperand() { + return rightOperand; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetRightOperand(Term newRightOperand, NotificationChain msgs) { + Term oldRightOperand = rightOperand; + rightOperand = newRightOperand; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.NUMERIC_OPERATION__RIGHT_OPERAND, oldRightOperand, newRightOperand); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + @Override + public void setRightOperand(Term newRightOperand) { + if (newRightOperand != rightOperand) { + NotificationChain msgs = null; + if (rightOperand != null) + msgs = ((InternalEObject)rightOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.NUMERIC_OPERATION__RIGHT_OPERAND, null, msgs); + if (newRightOperand != null) + msgs = ((InternalEObject)newRightOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.NUMERIC_OPERATION__RIGHT_OPERAND, null, msgs); + msgs = basicSetRightOperand(newRightOperand, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.NUMERIC_OPERATION__RIGHT_OPERAND, newRightOperand, newRightOperand)); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case LogiclanguagePackage.NUMERIC_OPERATION__LEFT_OPERAND: + return basicSetLeftOperand(null, msgs); + case LogiclanguagePackage.NUMERIC_OPERATION__RIGHT_OPERAND: + return basicSetRightOperand(null, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case LogiclanguagePackage.NUMERIC_OPERATION__LEFT_OPERAND: + return getLeftOperand(); + case LogiclanguagePackage.NUMERIC_OPERATION__RIGHT_OPERAND: + return getRightOperand(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case LogiclanguagePackage.NUMERIC_OPERATION__LEFT_OPERAND: + setLeftOperand((Term)newValue); + return; + case LogiclanguagePackage.NUMERIC_OPERATION__RIGHT_OPERAND: + setRightOperand((Term)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case LogiclanguagePackage.NUMERIC_OPERATION__LEFT_OPERAND: + setLeftOperand((Term)null); + return; + case LogiclanguagePackage.NUMERIC_OPERATION__RIGHT_OPERAND: + setRightOperand((Term)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case LogiclanguagePackage.NUMERIC_OPERATION__LEFT_OPERAND: + return leftOperand != null; + case LogiclanguagePackage.NUMERIC_OPERATION__RIGHT_OPERAND: + return rightOperand != null; + } + return super.eIsSet(featureID); + } + +} //NumericOperationImpl diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/OrImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/OrImpl.java index 9ef8357a..a5404a7c 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/OrImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/OrImpl.java @@ -66,6 +66,7 @@ public class OrImpl extends BoolOperationImpl implements Or { * * @generated */ + @Override public EList getOperands() { if (operands == null) { operands = new EObjectContainmentEList(Term.class, this, LogiclanguagePackage.OR__OPERANDS); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/PlusImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/PlusImpl.java index c9d0d591..68bf6357 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/PlusImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/PlusImpl.java @@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.EClass; * * @generated */ -public class PlusImpl extends IntOperationImpl implements Plus { +public class PlusImpl extends NumericOperationImpl implements Plus { /** * * diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/PowImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/PowImpl.java new file mode 100644 index 00000000..28ecf686 --- /dev/null +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/PowImpl.java @@ -0,0 +1,37 @@ +/** + */ +package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl; + +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage; +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Pow; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Pow'. + * + * + * @generated + */ +public class PowImpl extends NumericOperationImpl implements Pow { + /** + * + * + * @generated + */ + protected PowImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LogiclanguagePackage.Literals.POW; + } + +} //PowImpl diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ProjectedAggregateExpressionImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ProjectedAggregateExpressionImpl.java new file mode 100644 index 00000000..1085b972 --- /dev/null +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ProjectedAggregateExpressionImpl.java @@ -0,0 +1,164 @@ +/** + */ +package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl; + +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage; +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ProjectedAggregateExpression; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +/** + * + * An implementation of the model object 'Projected Aggregate Expression'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.ProjectedAggregateExpressionImpl#getProjectionIndex Projection Index}
    • + *
+ * + * @generated + */ +public abstract class ProjectedAggregateExpressionImpl extends AggregateExpressionImpl implements ProjectedAggregateExpression { + /** + * The default value of the '{@link #getProjectionIndex() Projection Index}' attribute. + * + * + * @see #getProjectionIndex() + * @generated + * @ordered + */ + protected static final int PROJECTION_INDEX_EDEFAULT = -1; + + /** + * The cached value of the '{@link #getProjectionIndex() Projection Index}' attribute. + * + * + * @see #getProjectionIndex() + * @generated + * @ordered + */ + protected int projectionIndex = PROJECTION_INDEX_EDEFAULT; + + /** + * + * + * @generated + */ + protected ProjectedAggregateExpressionImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LogiclanguagePackage.Literals.PROJECTED_AGGREGATE_EXPRESSION; + } + + /** + * + * + * @generated + */ + @Override + public int getProjectionIndex() { + return projectionIndex; + } + + /** + * + * + * @generated + */ + @Override + public void setProjectionIndex(int newProjectionIndex) { + int oldProjectionIndex = projectionIndex; + projectionIndex = newProjectionIndex; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.PROJECTED_AGGREGATE_EXPRESSION__PROJECTION_INDEX, oldProjectionIndex, projectionIndex)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case LogiclanguagePackage.PROJECTED_AGGREGATE_EXPRESSION__PROJECTION_INDEX: + return getProjectionIndex(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case LogiclanguagePackage.PROJECTED_AGGREGATE_EXPRESSION__PROJECTION_INDEX: + setProjectionIndex((Integer)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case LogiclanguagePackage.PROJECTED_AGGREGATE_EXPRESSION__PROJECTION_INDEX: + setProjectionIndex(PROJECTION_INDEX_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case LogiclanguagePackage.PROJECTED_AGGREGATE_EXPRESSION__PROJECTION_INDEX: + return projectionIndex != PROJECTION_INDEX_EDEFAULT; + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuilder result = new StringBuilder(super.toString()); + result.append(" (projectionIndex: "); + result.append(projectionIndex); + result.append(')'); + return result.toString(); + } + +} //ProjectedAggregateExpressionImpl diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/QuantifiedExpressionImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/QuantifiedExpressionImpl.java index dad2d1af..e1388e48 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/QuantifiedExpressionImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/QuantifiedExpressionImpl.java @@ -81,6 +81,7 @@ public abstract class QuantifiedExpressionImpl extends TermImpl implements Quant * * @generated */ + @Override public EList getQuantifiedVariables() { if (quantifiedVariables == null) { quantifiedVariables = new EObjectContainmentEList(Variable.class, this, LogiclanguagePackage.QUANTIFIED_EXPRESSION__QUANTIFIED_VARIABLES); @@ -93,6 +94,7 @@ public abstract class QuantifiedExpressionImpl extends TermImpl implements Quant * * @generated */ + @Override public Term getExpression() { return expression; } @@ -117,6 +119,7 @@ public abstract class QuantifiedExpressionImpl extends TermImpl implements Quant * * @generated */ + @Override public void setExpression(Term newExpression) { if (newExpression != expression) { NotificationChain msgs = null; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RealLiteralImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RealLiteralImpl.java index 54594606..ffb2b97f 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RealLiteralImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RealLiteralImpl.java @@ -71,6 +71,7 @@ public class RealLiteralImpl extends AtomicTermImpl implements RealLiteral { * * @generated */ + @Override public BigDecimal getValue() { return value; } @@ -80,6 +81,7 @@ public class RealLiteralImpl extends AtomicTermImpl implements RealLiteral { * * @generated */ + @Override public void setValue(BigDecimal newValue) { BigDecimal oldValue = value; value = newValue; @@ -154,7 +156,7 @@ public class RealLiteralImpl extends AtomicTermImpl implements RealLiteral { public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RelationDefinitionImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RelationDefinitionImpl.java index 017518eb..dc8c94b3 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RelationDefinitionImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RelationDefinitionImpl.java @@ -92,6 +92,7 @@ public class RelationDefinitionImpl extends RelationImpl implements RelationDefi * * @generated */ + @Override public EList getVariables() { if (variables == null) { variables = new EObjectContainmentEList(Variable.class, this, LogiclanguagePackage.RELATION_DEFINITION__VARIABLES); @@ -104,6 +105,7 @@ public class RelationDefinitionImpl extends RelationImpl implements RelationDefi * * @generated */ + @Override public Term getValue() { return value; } @@ -128,6 +130,7 @@ public class RelationDefinitionImpl extends RelationImpl implements RelationDefi * * @generated */ + @Override public void setValue(Term newValue) { if (newValue != value) { NotificationChain msgs = null; @@ -147,6 +150,7 @@ public class RelationDefinitionImpl extends RelationImpl implements RelationDefi * * @generated */ + @Override public RelationDeclaration getDefines() { if (defines != null && defines.eIsProxy()) { InternalEObject oldDefines = (InternalEObject)defines; @@ -173,6 +177,7 @@ public class RelationDefinitionImpl extends RelationImpl implements RelationDefi * * @generated */ + @Override public void setDefines(RelationDeclaration newDefines) { RelationDeclaration oldDefines = defines; defines = newDefines; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RelationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RelationImpl.java index a0127ab8..e6f943e5 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RelationImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RelationImpl.java @@ -80,6 +80,7 @@ public abstract class RelationImpl extends SymbolicDeclarationImpl implements Re * * @generated */ + @Override public EList getParameters() { if (parameters == null) { parameters = new EObjectContainmentEList(TypeReference.class, this, LogiclanguagePackage.RELATION__PARAMETERS); @@ -92,6 +93,7 @@ public abstract class RelationImpl extends SymbolicDeclarationImpl implements Re * * @generated */ + @Override public EList getAnnotations() { if (annotations == null) { annotations = new EObjectWithInverseResolvingEList(RelationAnnotation.class, this, LogiclanguagePackage.RELATION__ANNOTATIONS, LogicproblemPackage.RELATION_ANNOTATION__TARGET); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/StringLiteralImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/StringLiteralImpl.java index 339af3ba..6c1586a1 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/StringLiteralImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/StringLiteralImpl.java @@ -69,6 +69,7 @@ public class StringLiteralImpl extends AtomicTermImpl implements StringLiteral { * * @generated */ + @Override public String getValue() { return value; } @@ -78,6 +79,7 @@ public class StringLiteralImpl extends AtomicTermImpl implements StringLiteral { * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; value = newValue; @@ -152,7 +154,7 @@ public class StringLiteralImpl extends AtomicTermImpl implements StringLiteral { public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/SumImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/SumImpl.java new file mode 100644 index 00000000..3622dfb9 --- /dev/null +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/SumImpl.java @@ -0,0 +1,37 @@ +/** + */ +package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl; + +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage; +import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Sum; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Sum'. + * + * + * @generated + */ +public class SumImpl extends ProjectedAggregateExpressionImpl implements Sum { + /** + * + * + * @generated + */ + protected SumImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LogiclanguagePackage.Literals.SUM; + } + +} //SumImpl diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/SymbolicDeclarationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/SymbolicDeclarationImpl.java index 1f28cbd7..6a7110bb 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/SymbolicDeclarationImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/SymbolicDeclarationImpl.java @@ -67,6 +67,7 @@ public abstract class SymbolicDeclarationImpl extends MinimalEObjectImpl.Contain * * @generated */ + @Override public String getName() { return name; } @@ -76,6 +77,7 @@ public abstract class SymbolicDeclarationImpl extends MinimalEObjectImpl.Contain * * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -151,7 +153,7 @@ public abstract class SymbolicDeclarationImpl extends MinimalEObjectImpl.Contain public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/SymbolicValueImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/SymbolicValueImpl.java index 59e1a7d3..4c505cd6 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/SymbolicValueImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/SymbolicValueImpl.java @@ -81,6 +81,7 @@ public class SymbolicValueImpl extends TermImpl implements SymbolicValue { * * @generated */ + @Override public SymbolicDeclaration getSymbolicReference() { if (symbolicReference != null && symbolicReference.eIsProxy()) { InternalEObject oldSymbolicReference = (InternalEObject)symbolicReference; @@ -107,6 +108,7 @@ public class SymbolicValueImpl extends TermImpl implements SymbolicValue { * * @generated */ + @Override public void setSymbolicReference(SymbolicDeclaration newSymbolicReference) { SymbolicDeclaration oldSymbolicReference = symbolicReference; symbolicReference = newSymbolicReference; @@ -119,6 +121,7 @@ public class SymbolicValueImpl extends TermImpl implements SymbolicValue { * * @generated */ + @Override public EList getParameterSubstitutions() { if (parameterSubstitutions == null) { parameterSubstitutions = new EObjectContainmentEList(Term.class, this, LogiclanguagePackage.SYMBOLIC_VALUE__PARAMETER_SUBSTITUTIONS); 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 ecd0eeaf..b7ad1f50 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 @@ -85,6 +85,7 @@ public class TransitiveClosureImpl extends TermImpl implements TransitiveClosure * * @generated */ + @Override public Term getLeftOperand() { return leftOperand; } @@ -109,6 +110,7 @@ public class TransitiveClosureImpl extends TermImpl implements TransitiveClosure * * @generated */ + @Override public void setLeftOperand(Term newLeftOperand) { if (newLeftOperand != leftOperand) { NotificationChain msgs = null; @@ -128,6 +130,7 @@ public class TransitiveClosureImpl extends TermImpl implements TransitiveClosure * * @generated */ + @Override public Term getRightOperand() { return rightOperand; } @@ -152,6 +155,7 @@ public class TransitiveClosureImpl extends TermImpl implements TransitiveClosure * * @generated */ + @Override public void setRightOperand(Term newRightOperand) { if (newRightOperand != rightOperand) { NotificationChain msgs = null; @@ -171,6 +175,7 @@ public class TransitiveClosureImpl extends TermImpl implements TransitiveClosure * * @generated */ + @Override public Relation getRelation() { if (relation != null && relation.eIsProxy()) { InternalEObject oldRelation = (InternalEObject)relation; @@ -197,6 +202,7 @@ public class TransitiveClosureImpl extends TermImpl implements TransitiveClosure * * @generated */ + @Override public void setRelation(Relation newRelation) { Relation oldRelation = relation; relation = newRelation; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TypeDefinitionImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TypeDefinitionImpl.java index 02b2ec52..f1ee6db7 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TypeDefinitionImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TypeDefinitionImpl.java @@ -77,6 +77,7 @@ public class TypeDefinitionImpl extends TypeImpl implements TypeDefinition { * * @generated */ + @Override public EList getElements() { if (elements == null) { elements = new EObjectWithInverseResolvingEList.ManyInverse(DefinedElement.class, this, LogiclanguagePackage.TYPE_DEFINITION__ELEMENTS, LogiclanguagePackage.DEFINED_ELEMENT__DEFINED_IN_TYPE); @@ -89,6 +90,7 @@ public class TypeDefinitionImpl extends TypeImpl implements TypeDefinition { * * @generated */ + @Override public TypeDeclaration getDefines() { if (defines != null && defines.eIsProxy()) { InternalEObject oldDefines = (InternalEObject)defines; @@ -115,6 +117,7 @@ public class TypeDefinitionImpl extends TypeImpl implements TypeDefinition { * * @generated */ + @Override public void setDefines(TypeDeclaration newDefines) { TypeDeclaration oldDefines = defines; defines = newDefines; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TypeImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TypeImpl.java index f51d7ef5..3929baac 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TypeImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TypeImpl.java @@ -119,6 +119,7 @@ public abstract class TypeImpl extends MinimalEObjectImpl.Container implements T * * @generated */ + @Override public String getName() { return name; } @@ -128,6 +129,7 @@ public abstract class TypeImpl extends MinimalEObjectImpl.Container implements T * * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -140,6 +142,7 @@ public abstract class TypeImpl extends MinimalEObjectImpl.Container implements T * * @generated */ + @Override public EList getSubtypes() { if (subtypes == null) { subtypes = new EObjectWithInverseResolvingEList.ManyInverse(Type.class, this, LogiclanguagePackage.TYPE__SUBTYPES, LogiclanguagePackage.TYPE__SUPERTYPES); @@ -152,6 +155,7 @@ public abstract class TypeImpl extends MinimalEObjectImpl.Container implements T * * @generated */ + @Override public EList getSupertypes() { if (supertypes == null) { supertypes = new EObjectWithInverseResolvingEList.ManyInverse(Type.class, this, LogiclanguagePackage.TYPE__SUPERTYPES, LogiclanguagePackage.TYPE__SUBTYPES); @@ -164,6 +168,7 @@ public abstract class TypeImpl extends MinimalEObjectImpl.Container implements T * * @generated */ + @Override public boolean isIsAbstract() { return isAbstract; } @@ -173,6 +178,7 @@ public abstract class TypeImpl extends MinimalEObjectImpl.Container implements T * * @generated */ + @Override public void setIsAbstract(boolean newIsAbstract) { boolean oldIsAbstract = isAbstract; isAbstract = newIsAbstract; @@ -313,7 +319,7 @@ public abstract class TypeImpl extends MinimalEObjectImpl.Container implements T public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", isAbstract: "); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/VariableImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/VariableImpl.java index 5e862b9f..d499afad 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/VariableImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/VariableImpl.java @@ -62,6 +62,7 @@ public class VariableImpl extends SymbolicDeclarationImpl implements Variable { * * @generated */ + @Override public TypeReference getRange() { return range; } @@ -86,6 +87,7 @@ public class VariableImpl extends SymbolicDeclarationImpl implements Variable { * * @generated */ + @Override public void setRange(TypeReference newRange) { if (newRange != range) { NotificationChain msgs = null; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageAdapterFactory.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageAdapterFactory.java index d61c3a2a..25edee70 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageAdapterFactory.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageAdapterFactory.java @@ -204,8 +204,8 @@ public class LogiclanguageAdapterFactory extends AdapterFactoryImpl { return createMoreOrEqualThanAdapter(); } @Override - public Adapter caseIntOperation(IntOperation object) { - return createIntOperationAdapter(); + public Adapter caseNumericOperation(NumericOperation object) { + return createNumericOperationAdapter(); } @Override public Adapter casePlus(Plus object) { @@ -300,6 +300,34 @@ public class LogiclanguageAdapterFactory extends AdapterFactoryImpl { return createTransitiveClosureAdapter(); } @Override + public Adapter casePow(Pow object) { + return createPowAdapter(); + } + @Override + public Adapter caseAggregateExpression(AggregateExpression object) { + return createAggregateExpressionAdapter(); + } + @Override + public Adapter caseSum(Sum object) { + return createSumAdapter(); + } + @Override + public Adapter caseCount(Count object) { + return createCountAdapter(); + } + @Override + public Adapter caseMin(Min object) { + return createMinAdapter(); + } + @Override + public Adapter caseMax(Max object) { + return createMaxAdapter(); + } + @Override + public Adapter caseProjectedAggregateExpression(ProjectedAggregateExpression object) { + return createProjectedAggregateExpressionAdapter(); + } + @Override public Adapter defaultCase(EObject object) { return createEObjectAdapter(); } @@ -796,16 +824,16 @@ public class LogiclanguageAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntOperation Int Operation}'. + * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.NumericOperation Numeric Operation}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntOperation + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.NumericOperation * @generated */ - public Adapter createIntOperationAdapter() { + public Adapter createNumericOperationAdapter() { return null; } @@ -1131,6 +1159,104 @@ public class LogiclanguageAdapterFactory extends AdapterFactoryImpl { return null; } + /** + * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Pow Pow}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Pow + * @generated + */ + public Adapter createPowAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.AggregateExpression Aggregate Expression}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.AggregateExpression + * @generated + */ + public Adapter createAggregateExpressionAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Sum Sum}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Sum + * @generated + */ + public Adapter createSumAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Count Count}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Count + * @generated + */ + public Adapter createCountAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Min Min}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Min + * @generated + */ + public Adapter createMinAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Max Max}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Max + * @generated + */ + public Adapter createMaxAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ProjectedAggregateExpression Projected Aggregate Expression}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ProjectedAggregateExpression + * @generated + */ + public Adapter createProjectedAggregateExpressionAdapter() { + return null; + } + /** * Creates a new adapter for the default case. * 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 07554514..fc443484 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 @@ -353,18 +353,18 @@ public class LogiclanguageSwitch extends Switch { if (result == null) result = defaultCase(theEObject); return result; } - case LogiclanguagePackage.INT_OPERATION: { - IntOperation intOperation = (IntOperation)theEObject; - T result = caseIntOperation(intOperation); - if (result == null) result = caseTerm(intOperation); - if (result == null) result = caseTermDescription(intOperation); + case LogiclanguagePackage.NUMERIC_OPERATION: { + NumericOperation numericOperation = (NumericOperation)theEObject; + T result = caseNumericOperation(numericOperation); + if (result == null) result = caseTerm(numericOperation); + if (result == null) result = caseTermDescription(numericOperation); if (result == null) result = defaultCase(theEObject); return result; } case LogiclanguagePackage.PLUS: { Plus plus = (Plus)theEObject; T result = casePlus(plus); - if (result == null) result = caseIntOperation(plus); + if (result == null) result = caseNumericOperation(plus); if (result == null) result = caseTerm(plus); if (result == null) result = caseTermDescription(plus); if (result == null) result = defaultCase(theEObject); @@ -373,7 +373,7 @@ public class LogiclanguageSwitch extends Switch { case LogiclanguagePackage.MINUS: { Minus minus = (Minus)theEObject; T result = caseMinus(minus); - if (result == null) result = caseIntOperation(minus); + if (result == null) result = caseNumericOperation(minus); if (result == null) result = caseTerm(minus); if (result == null) result = caseTermDescription(minus); if (result == null) result = defaultCase(theEObject); @@ -382,7 +382,7 @@ public class LogiclanguageSwitch extends Switch { case LogiclanguagePackage.MULTIPLY: { Multiply multiply = (Multiply)theEObject; T result = caseMultiply(multiply); - if (result == null) result = caseIntOperation(multiply); + if (result == null) result = caseNumericOperation(multiply); if (result == null) result = caseTerm(multiply); if (result == null) result = caseTermDescription(multiply); if (result == null) result = defaultCase(theEObject); @@ -391,7 +391,7 @@ public class LogiclanguageSwitch extends Switch { case LogiclanguagePackage.DIVISON: { Divison divison = (Divison)theEObject; T result = caseDivison(divison); - if (result == null) result = caseIntOperation(divison); + if (result == null) result = caseNumericOperation(divison); if (result == null) result = caseTerm(divison); if (result == null) result = caseTermDescription(divison); if (result == null) result = defaultCase(theEObject); @@ -400,7 +400,7 @@ public class LogiclanguageSwitch extends Switch { case LogiclanguagePackage.MOD: { Mod mod = (Mod)theEObject; T result = caseMod(mod); - if (result == null) result = caseIntOperation(mod); + if (result == null) result = caseNumericOperation(mod); if (result == null) result = caseTerm(mod); if (result == null) result = caseTermDescription(mod); if (result == null) result = defaultCase(theEObject); @@ -552,6 +552,71 @@ public class LogiclanguageSwitch extends Switch { if (result == null) result = defaultCase(theEObject); return result; } + case LogiclanguagePackage.POW: { + Pow pow = (Pow)theEObject; + T result = casePow(pow); + if (result == null) result = caseNumericOperation(pow); + if (result == null) result = caseTerm(pow); + if (result == null) result = caseTermDescription(pow); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LogiclanguagePackage.AGGREGATE_EXPRESSION: { + AggregateExpression aggregateExpression = (AggregateExpression)theEObject; + T result = caseAggregateExpression(aggregateExpression); + if (result == null) result = caseTerm(aggregateExpression); + if (result == null) result = caseTermDescription(aggregateExpression); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LogiclanguagePackage.SUM: { + Sum sum = (Sum)theEObject; + T result = caseSum(sum); + if (result == null) result = caseProjectedAggregateExpression(sum); + if (result == null) result = caseAggregateExpression(sum); + if (result == null) result = caseTerm(sum); + if (result == null) result = caseTermDescription(sum); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LogiclanguagePackage.COUNT: { + Count count = (Count)theEObject; + T result = caseCount(count); + if (result == null) result = caseAggregateExpression(count); + if (result == null) result = caseTerm(count); + if (result == null) result = caseTermDescription(count); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LogiclanguagePackage.MIN: { + Min min = (Min)theEObject; + T result = caseMin(min); + if (result == null) result = caseProjectedAggregateExpression(min); + if (result == null) result = caseAggregateExpression(min); + if (result == null) result = caseTerm(min); + if (result == null) result = caseTermDescription(min); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LogiclanguagePackage.MAX: { + Max max = (Max)theEObject; + T result = caseMax(max); + if (result == null) result = caseProjectedAggregateExpression(max); + if (result == null) result = caseAggregateExpression(max); + if (result == null) result = caseTerm(max); + if (result == null) result = caseTermDescription(max); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LogiclanguagePackage.PROJECTED_AGGREGATE_EXPRESSION: { + ProjectedAggregateExpression projectedAggregateExpression = (ProjectedAggregateExpression)theEObject; + T result = caseProjectedAggregateExpression(projectedAggregateExpression); + if (result == null) result = caseAggregateExpression(projectedAggregateExpression); + if (result == null) result = caseTerm(projectedAggregateExpression); + if (result == null) result = caseTermDescription(projectedAggregateExpression); + if (result == null) result = defaultCase(theEObject); + return result; + } default: return defaultCase(theEObject); } } @@ -1067,17 +1132,17 @@ public class LogiclanguageSwitch extends Switch { } /** - * Returns the result of interpreting the object as an instance of 'Int Operation'. + * Returns the result of interpreting the object as an instance of 'Numeric Operation'. * * This implementation returns null; * returning a non-null result will terminate the switch. * * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Int Operation'. + * @return the result of interpreting the object as an instance of 'Numeric Operation'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseIntOperation(IntOperation object) { + public T caseNumericOperation(NumericOperation object) { return null; } @@ -1426,6 +1491,111 @@ public class LogiclanguageSwitch extends Switch { return null; } + /** + * Returns the result of interpreting the object as an instance of 'Pow'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Pow'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T casePow(Pow object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Aggregate Expression'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Aggregate Expression'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseAggregateExpression(AggregateExpression object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Sum'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Sum'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseSum(Sum object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Count'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Count'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseCount(Count object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Min'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Min'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseMin(Min object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Max'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Max'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseMax(Max object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Projected Aggregate Expression'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Projected Aggregate Expression'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseProjectedAggregateExpression(ProjectedAggregateExpression object) { + return null; + } + /** * Returns the result of interpreting the object as an instance of 'EObject'. * diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/AssertionAnnotationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/AssertionAnnotationImpl.java index 1e015974..8475fa72 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/AssertionAnnotationImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/AssertionAnnotationImpl.java @@ -64,6 +64,7 @@ public class AssertionAnnotationImpl extends AnnotationImpl implements Assertion * * @generated */ + @Override public Assertion getTarget() { if (target != null && target.eIsProxy()) { InternalEObject oldTarget = (InternalEObject)target; @@ -105,6 +106,7 @@ public class AssertionAnnotationImpl extends AnnotationImpl implements Assertion * * @generated */ + @Override public void setTarget(Assertion newTarget) { if (newTarget != target) { NotificationChain msgs = null; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/ConstantAnnotationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/ConstantAnnotationImpl.java index 734ce70c..b9021015 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/ConstantAnnotationImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/ConstantAnnotationImpl.java @@ -64,6 +64,7 @@ public class ConstantAnnotationImpl extends AnnotationImpl implements ConstantAn * * @generated */ + @Override public Constant getTarget() { if (target != null && target.eIsProxy()) { InternalEObject oldTarget = (InternalEObject)target; @@ -105,6 +106,7 @@ public class ConstantAnnotationImpl extends AnnotationImpl implements ConstantAn * * @generated */ + @Override public void setTarget(Constant newTarget) { if (newTarget != target) { NotificationChain msgs = null; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/ContainmentHierarchyImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/ContainmentHierarchyImpl.java index 909f49a5..bb7b8ede 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/ContainmentHierarchyImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/ContainmentHierarchyImpl.java @@ -105,6 +105,7 @@ public class ContainmentHierarchyImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public EList getTypesOrderedInHierarchy() { if (typesOrderedInHierarchy == null) { typesOrderedInHierarchy = new EObjectResolvingEList(Type.class, this, LogicproblemPackage.CONTAINMENT_HIERARCHY__TYPES_ORDERED_IN_HIERARCHY); @@ -117,6 +118,7 @@ public class ContainmentHierarchyImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public EList getContainmentFunctions() { if (containmentFunctions == null) { containmentFunctions = new EObjectResolvingEList(Function.class, this, LogicproblemPackage.CONTAINMENT_HIERARCHY__CONTAINMENT_FUNCTIONS); @@ -129,6 +131,7 @@ public class ContainmentHierarchyImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public EList getContainmentRelations() { if (containmentRelations == null) { containmentRelations = new EObjectResolvingEList(Relation.class, this, LogicproblemPackage.CONTAINMENT_HIERARCHY__CONTAINMENT_RELATIONS); @@ -141,6 +144,7 @@ public class ContainmentHierarchyImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public Constant getRootConstant() { if (rootConstant != null && rootConstant.eIsProxy()) { InternalEObject oldRootConstant = (InternalEObject)rootConstant; @@ -167,6 +171,7 @@ public class ContainmentHierarchyImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setRootConstant(Constant newRootConstant) { Constant oldRootConstant = rootConstant; rootConstant = newRootConstant; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/FunctionAnnotationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/FunctionAnnotationImpl.java index 77ee58c2..a65374f8 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/FunctionAnnotationImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/FunctionAnnotationImpl.java @@ -64,6 +64,7 @@ public class FunctionAnnotationImpl extends AnnotationImpl implements FunctionAn * * @generated */ + @Override public Function getTarget() { if (target != null && target.eIsProxy()) { InternalEObject oldTarget = (InternalEObject)target; @@ -105,6 +106,7 @@ public class FunctionAnnotationImpl extends AnnotationImpl implements FunctionAn * * @generated */ + @Override public void setTarget(Function newTarget) { if (newTarget != target) { NotificationChain msgs = null; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicProblemImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicProblemImpl.java index 70b31163..f3aa5808 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicProblemImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicProblemImpl.java @@ -152,6 +152,7 @@ public class LogicProblemImpl extends MinimalEObjectImpl.Container implements Lo * * @generated */ + @Override public EList getTypes() { if (types == null) { types = new EObjectContainmentEList(Type.class, this, LogicproblemPackage.LOGIC_PROBLEM__TYPES); @@ -164,6 +165,7 @@ public class LogicProblemImpl extends MinimalEObjectImpl.Container implements Lo * * @generated */ + @Override public EList getFunctions() { if (functions == null) { functions = new EObjectContainmentEList(Function.class, this, LogicproblemPackage.LOGIC_PROBLEM__FUNCTIONS); @@ -176,6 +178,7 @@ public class LogicProblemImpl extends MinimalEObjectImpl.Container implements Lo * * @generated */ + @Override public EList getAssertions() { if (assertions == null) { assertions = new EObjectContainmentEList(Assertion.class, this, LogicproblemPackage.LOGIC_PROBLEM__ASSERTIONS); @@ -188,6 +191,7 @@ public class LogicProblemImpl extends MinimalEObjectImpl.Container implements Lo * * @generated */ + @Override public EList getRelations() { if (relations == null) { relations = new EObjectContainmentEList(Relation.class, this, LogicproblemPackage.LOGIC_PROBLEM__RELATIONS); @@ -200,6 +204,7 @@ public class LogicProblemImpl extends MinimalEObjectImpl.Container implements Lo * * @generated */ + @Override public EList getConstants() { if (constants == null) { constants = new EObjectContainmentEList(Constant.class, this, LogicproblemPackage.LOGIC_PROBLEM__CONSTANTS); @@ -212,6 +217,7 @@ public class LogicProblemImpl extends MinimalEObjectImpl.Container implements Lo * * @generated */ + @Override public EList getElements() { if (elements == null) { elements = new EObjectContainmentEList(DefinedElement.class, this, LogicproblemPackage.LOGIC_PROBLEM__ELEMENTS); @@ -224,6 +230,7 @@ public class LogicProblemImpl extends MinimalEObjectImpl.Container implements Lo * * @generated */ + @Override public EList getContainmentHierarchies() { if (containmentHierarchies == null) { containmentHierarchies = new EObjectContainmentEList(ContainmentHierarchy.class, this, LogicproblemPackage.LOGIC_PROBLEM__CONTAINMENT_HIERARCHIES); @@ -236,6 +243,7 @@ public class LogicProblemImpl extends MinimalEObjectImpl.Container implements Lo * * @generated */ + @Override public EList getAnnotations() { if (annotations == null) { annotations = new EObjectContainmentEList(Annotation.class, this, LogicproblemPackage.LOGIC_PROBLEM__ANNOTATIONS); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicproblemFactoryImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicproblemFactoryImpl.java index 66a8f116..a4703586 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicproblemFactoryImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicproblemFactoryImpl.java @@ -73,6 +73,7 @@ public class LogicproblemFactoryImpl extends EFactoryImpl implements Logicproble * * @generated */ + @Override public LogicProblem createLogicProblem() { LogicProblemImpl logicProblem = new LogicProblemImpl(); return logicProblem; @@ -83,6 +84,7 @@ public class LogicproblemFactoryImpl extends EFactoryImpl implements Logicproble * * @generated */ + @Override public ContainmentHierarchy createContainmentHierarchy() { ContainmentHierarchyImpl containmentHierarchy = new ContainmentHierarchyImpl(); return containmentHierarchy; @@ -93,6 +95,7 @@ public class LogicproblemFactoryImpl extends EFactoryImpl implements Logicproble * * @generated */ + @Override public RelationAnnotation createRelationAnnotation() { RelationAnnotationImpl relationAnnotation = new RelationAnnotationImpl(); return relationAnnotation; @@ -103,6 +106,7 @@ public class LogicproblemFactoryImpl extends EFactoryImpl implements Logicproble * * @generated */ + @Override public ConstantAnnotation createConstantAnnotation() { ConstantAnnotationImpl constantAnnotation = new ConstantAnnotationImpl(); return constantAnnotation; @@ -113,6 +117,7 @@ public class LogicproblemFactoryImpl extends EFactoryImpl implements Logicproble * * @generated */ + @Override public FunctionAnnotation createFunctionAnnotation() { FunctionAnnotationImpl functionAnnotation = new FunctionAnnotationImpl(); return functionAnnotation; @@ -123,6 +128,7 @@ public class LogicproblemFactoryImpl extends EFactoryImpl implements Logicproble * * @generated */ + @Override public AssertionAnnotation createAssertionAnnotation() { AssertionAnnotationImpl assertionAnnotation = new AssertionAnnotationImpl(); return assertionAnnotation; @@ -133,6 +139,7 @@ public class LogicproblemFactoryImpl extends EFactoryImpl implements Logicproble * * @generated */ + @Override public Annotation createAnnotation() { AnnotationImpl annotation = new AnnotationImpl(); return annotation; @@ -143,6 +150,7 @@ public class LogicproblemFactoryImpl extends EFactoryImpl implements Logicproble * * @generated */ + @Override public LogicproblemPackage getLogicproblemPackage() { return (LogicproblemPackage)getEPackage(); } diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicproblemPackageImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicproblemPackageImpl.java index 1dd429e7..3d50b05c 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicproblemPackageImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicproblemPackageImpl.java @@ -109,7 +109,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link LogicproblemPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -123,13 +123,16 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble if (isInited) return (LogicproblemPackage)EPackage.Registry.INSTANCE.getEPackage(LogicproblemPackage.eNS_URI); // Obtain or create and register package - LogicproblemPackageImpl theLogicproblemPackage = (LogicproblemPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LogicproblemPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LogicproblemPackageImpl()); + Object registeredLogicproblemPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LogicproblemPackageImpl theLogicproblemPackage = registeredLogicproblemPackage instanceof LogicproblemPackageImpl ? (LogicproblemPackageImpl)registeredLogicproblemPackage : new LogicproblemPackageImpl(); isInited = true; // Obtain or create and register interdependencies - LogiclanguagePackageImpl theLogiclanguagePackage = (LogiclanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LogiclanguagePackage.eNS_URI) instanceof LogiclanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LogiclanguagePackage.eNS_URI) : LogiclanguagePackage.eINSTANCE); - LogicresultPackageImpl theLogicresultPackage = (LogicresultPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LogicresultPackage.eNS_URI) instanceof LogicresultPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LogicresultPackage.eNS_URI) : LogicresultPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LogiclanguagePackage.eNS_URI); + LogiclanguagePackageImpl theLogiclanguagePackage = (LogiclanguagePackageImpl)(registeredPackage instanceof LogiclanguagePackageImpl ? registeredPackage : LogiclanguagePackage.eINSTANCE); + registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LogicresultPackage.eNS_URI); + LogicresultPackageImpl theLogicresultPackage = (LogicresultPackageImpl)(registeredPackage instanceof LogicresultPackageImpl ? registeredPackage : LogicresultPackage.eINSTANCE); // Create package meta-data objects theLogicproblemPackage.createPackageContents(); @@ -144,7 +147,6 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble // Mark meta-data to indicate it can't be changed theLogicproblemPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(LogicproblemPackage.eNS_URI, theLogicproblemPackage); return theLogicproblemPackage; @@ -155,6 +157,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EClass getLogicProblem() { return logicProblemEClass; } @@ -164,6 +167,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EReference getLogicProblem_Types() { return (EReference)logicProblemEClass.getEStructuralFeatures().get(0); } @@ -173,6 +177,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EReference getLogicProblem_Functions() { return (EReference)logicProblemEClass.getEStructuralFeatures().get(1); } @@ -182,6 +187,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EReference getLogicProblem_Assertions() { return (EReference)logicProblemEClass.getEStructuralFeatures().get(2); } @@ -191,6 +197,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EReference getLogicProblem_Relations() { return (EReference)logicProblemEClass.getEStructuralFeatures().get(3); } @@ -200,6 +207,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EReference getLogicProblem_Constants() { return (EReference)logicProblemEClass.getEStructuralFeatures().get(4); } @@ -209,6 +217,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EReference getLogicProblem_Elements() { return (EReference)logicProblemEClass.getEStructuralFeatures().get(5); } @@ -218,6 +227,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EReference getLogicProblem_ContainmentHierarchies() { return (EReference)logicProblemEClass.getEStructuralFeatures().get(6); } @@ -227,6 +237,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EReference getLogicProblem_Annotations() { return (EReference)logicProblemEClass.getEStructuralFeatures().get(7); } @@ -236,6 +247,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EClass getContainmentHierarchy() { return containmentHierarchyEClass; } @@ -245,6 +257,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EReference getContainmentHierarchy_TypesOrderedInHierarchy() { return (EReference)containmentHierarchyEClass.getEStructuralFeatures().get(0); } @@ -254,6 +267,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EReference getContainmentHierarchy_ContainmentFunctions() { return (EReference)containmentHierarchyEClass.getEStructuralFeatures().get(1); } @@ -263,6 +277,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EReference getContainmentHierarchy_ContainmentRelations() { return (EReference)containmentHierarchyEClass.getEStructuralFeatures().get(2); } @@ -272,6 +287,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EReference getContainmentHierarchy_RootConstant() { return (EReference)containmentHierarchyEClass.getEStructuralFeatures().get(3); } @@ -281,6 +297,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EClass getRelationAnnotation() { return relationAnnotationEClass; } @@ -290,6 +307,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EReference getRelationAnnotation_Target() { return (EReference)relationAnnotationEClass.getEStructuralFeatures().get(0); } @@ -299,6 +317,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EClass getConstantAnnotation() { return constantAnnotationEClass; } @@ -308,6 +327,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EReference getConstantAnnotation_Target() { return (EReference)constantAnnotationEClass.getEStructuralFeatures().get(0); } @@ -317,6 +337,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EClass getFunctionAnnotation() { return functionAnnotationEClass; } @@ -326,6 +347,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EReference getFunctionAnnotation_Target() { return (EReference)functionAnnotationEClass.getEStructuralFeatures().get(0); } @@ -335,6 +357,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EClass getAssertionAnnotation() { return assertionAnnotationEClass; } @@ -344,6 +367,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EReference getAssertionAnnotation_Target() { return (EReference)assertionAnnotationEClass.getEStructuralFeatures().get(0); } @@ -353,6 +377,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public EClass getAnnotation() { return annotationEClass; } @@ -362,6 +387,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble * * @generated */ + @Override public LogicproblemFactory getLogicproblemFactory() { return (LogicproblemFactory)getEFactoryInstance(); } diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/RelationAnnotationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/RelationAnnotationImpl.java index 23fb6e5d..22e5527e 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/RelationAnnotationImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/RelationAnnotationImpl.java @@ -64,6 +64,7 @@ public class RelationAnnotationImpl extends AnnotationImpl implements RelationAn * * @generated */ + @Override public Relation getTarget() { if (target != null && target.eIsProxy()) { InternalEObject oldTarget = (InternalEObject)target; @@ -105,6 +106,7 @@ public class RelationAnnotationImpl extends AnnotationImpl implements RelationAn * * @generated */ + @Override public void setTarget(Relation newTarget) { if (newTarget != target) { NotificationChain msgs = null; diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/ErrorResultImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/ErrorResultImpl.java index 579bc772..979f4778 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/ErrorResultImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/ErrorResultImpl.java @@ -69,6 +69,7 @@ public class ErrorResultImpl extends UnknownResultImpl implements ErrorResult { * * @generated */ + @Override public String getMessage() { return message; } @@ -78,6 +79,7 @@ public class ErrorResultImpl extends UnknownResultImpl implements ErrorResult { * * @generated */ + @Override public void setMessage(String newMessage) { String oldMessage = message; message = newMessage; @@ -152,7 +154,7 @@ public class ErrorResultImpl extends UnknownResultImpl implements ErrorResult { public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (message: "); result.append(message); result.append(')'); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/InsuficientResourcesResultImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/InsuficientResourcesResultImpl.java index 3f8d7ebf..3febc803 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/InsuficientResourcesResultImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/InsuficientResourcesResultImpl.java @@ -69,6 +69,7 @@ public class InsuficientResourcesResultImpl extends UnknownResultImpl implements * * @generated */ + @Override public String getResourceName() { return resourceName; } @@ -78,6 +79,7 @@ public class InsuficientResourcesResultImpl extends UnknownResultImpl implements * * @generated */ + @Override public void setResourceName(String newResourceName) { String oldResourceName = resourceName; resourceName = newResourceName; @@ -152,7 +154,7 @@ public class InsuficientResourcesResultImpl extends UnknownResultImpl implements public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (resourceName: "); result.append(resourceName); result.append(')'); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/IntStatisticEntryImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/IntStatisticEntryImpl.java index e8bedf70..663f9014 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/IntStatisticEntryImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/IntStatisticEntryImpl.java @@ -69,6 +69,7 @@ public class IntStatisticEntryImpl extends StatisticEntryImpl implements IntStat * * @generated */ + @Override public int getValue() { return value; } @@ -78,6 +79,7 @@ public class IntStatisticEntryImpl extends StatisticEntryImpl implements IntStat * * @generated */ + @Override public void setValue(int newValue) { int oldValue = value; value = newValue; @@ -152,7 +154,7 @@ public class IntStatisticEntryImpl extends StatisticEntryImpl implements IntStat public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicResultImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicResultImpl.java index 1bd5c833..a49e0bce 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicResultImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicResultImpl.java @@ -111,6 +111,7 @@ public abstract class LogicResultImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public LogicProblem getProblem() { if (problem != null && problem.eIsProxy()) { InternalEObject oldProblem = (InternalEObject)problem; @@ -137,6 +138,7 @@ public abstract class LogicResultImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setProblem(LogicProblem newProblem) { LogicProblem oldProblem = problem; problem = newProblem; @@ -149,6 +151,7 @@ public abstract class LogicResultImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public Statistics getStatistics() { return statistics; } @@ -173,6 +176,7 @@ public abstract class LogicResultImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setStatistics(Statistics newStatistics) { if (newStatistics != statistics) { NotificationChain msgs = null; @@ -192,6 +196,7 @@ public abstract class LogicResultImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public Object getTrace() { return trace; } @@ -201,6 +206,7 @@ public abstract class LogicResultImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setTrace(Object newTrace) { Object oldTrace = trace; trace = newTrace; @@ -213,6 +219,7 @@ public abstract class LogicResultImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public EList getRepresentation() { if (representation == null) { representation = new EDataTypeUniqueEList(Object.class, this, LogicresultPackage.LOGIC_RESULT__REPRESENTATION); @@ -334,7 +341,7 @@ public abstract class LogicResultImpl extends MinimalEObjectImpl.Container imple public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (trace: "); result.append(trace); result.append(", representation: "); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicresultFactoryImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicresultFactoryImpl.java index 5a102523..1bbc4942 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicresultFactoryImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicresultFactoryImpl.java @@ -75,6 +75,7 @@ public class LogicresultFactoryImpl extends EFactoryImpl implements LogicresultF * * @generated */ + @Override public ModelResult createModelResult() { ModelResultImpl modelResult = new ModelResultImpl(); return modelResult; @@ -85,6 +86,7 @@ public class LogicresultFactoryImpl extends EFactoryImpl implements LogicresultF * * @generated */ + @Override public InconsistencyResult createInconsistencyResult() { InconsistencyResultImpl inconsistencyResult = new InconsistencyResultImpl(); return inconsistencyResult; @@ -95,6 +97,7 @@ public class LogicresultFactoryImpl extends EFactoryImpl implements LogicresultF * * @generated */ + @Override public InsuficientResourcesResult createInsuficientResourcesResult() { InsuficientResourcesResultImpl insuficientResourcesResult = new InsuficientResourcesResultImpl(); return insuficientResourcesResult; @@ -105,6 +108,7 @@ public class LogicresultFactoryImpl extends EFactoryImpl implements LogicresultF * * @generated */ + @Override public ErrorResult createErrorResult() { ErrorResultImpl errorResult = new ErrorResultImpl(); return errorResult; @@ -115,6 +119,7 @@ public class LogicresultFactoryImpl extends EFactoryImpl implements LogicresultF * * @generated */ + @Override public Statistics createStatistics() { StatisticsImpl statistics = new StatisticsImpl(); return statistics; @@ -125,6 +130,7 @@ public class LogicresultFactoryImpl extends EFactoryImpl implements LogicresultF * * @generated */ + @Override public UndecidableResult createUndecidableResult() { UndecidableResultImpl undecidableResult = new UndecidableResultImpl(); return undecidableResult; @@ -135,6 +141,7 @@ public class LogicresultFactoryImpl extends EFactoryImpl implements LogicresultF * * @generated */ + @Override public IntStatisticEntry createIntStatisticEntry() { IntStatisticEntryImpl intStatisticEntry = new IntStatisticEntryImpl(); return intStatisticEntry; @@ -145,6 +152,7 @@ public class LogicresultFactoryImpl extends EFactoryImpl implements LogicresultF * * @generated */ + @Override public RealStatisticEntry createRealStatisticEntry() { RealStatisticEntryImpl realStatisticEntry = new RealStatisticEntryImpl(); return realStatisticEntry; @@ -155,6 +163,7 @@ public class LogicresultFactoryImpl extends EFactoryImpl implements LogicresultF * * @generated */ + @Override public StringStatisticEntry createStringStatisticEntry() { StringStatisticEntryImpl stringStatisticEntry = new StringStatisticEntryImpl(); return stringStatisticEntry; @@ -165,6 +174,7 @@ public class LogicresultFactoryImpl extends EFactoryImpl implements LogicresultF * * @generated */ + @Override public LogicresultPackage getLogicresultPackage() { return (LogicresultPackage)getEPackage(); } diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicresultPackageImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicresultPackageImpl.java index 8b0e0605..e67784d2 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicresultPackageImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicresultPackageImpl.java @@ -151,7 +151,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link LogicresultPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -165,13 +165,16 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP if (isInited) return (LogicresultPackage)EPackage.Registry.INSTANCE.getEPackage(LogicresultPackage.eNS_URI); // Obtain or create and register package - LogicresultPackageImpl theLogicresultPackage = (LogicresultPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LogicresultPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LogicresultPackageImpl()); + Object registeredLogicresultPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LogicresultPackageImpl theLogicresultPackage = registeredLogicresultPackage instanceof LogicresultPackageImpl ? (LogicresultPackageImpl)registeredLogicresultPackage : new LogicresultPackageImpl(); isInited = true; // Obtain or create and register interdependencies - LogiclanguagePackageImpl theLogiclanguagePackage = (LogiclanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LogiclanguagePackage.eNS_URI) instanceof LogiclanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LogiclanguagePackage.eNS_URI) : LogiclanguagePackage.eINSTANCE); - LogicproblemPackageImpl theLogicproblemPackage = (LogicproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LogicproblemPackage.eNS_URI) instanceof LogicproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LogicproblemPackage.eNS_URI) : LogicproblemPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LogiclanguagePackage.eNS_URI); + LogiclanguagePackageImpl theLogiclanguagePackage = (LogiclanguagePackageImpl)(registeredPackage instanceof LogiclanguagePackageImpl ? registeredPackage : LogiclanguagePackage.eINSTANCE); + registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LogicproblemPackage.eNS_URI); + LogicproblemPackageImpl theLogicproblemPackage = (LogicproblemPackageImpl)(registeredPackage instanceof LogicproblemPackageImpl ? registeredPackage : LogicproblemPackage.eINSTANCE); // Create package meta-data objects theLogicresultPackage.createPackageContents(); @@ -186,7 +189,6 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP // Mark meta-data to indicate it can't be changed theLogicresultPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(LogicresultPackage.eNS_URI, theLogicresultPackage); return theLogicresultPackage; @@ -197,6 +199,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getLogicResult() { return logicResultEClass; } @@ -206,6 +209,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EReference getLogicResult_Problem() { return (EReference)logicResultEClass.getEStructuralFeatures().get(0); } @@ -215,6 +219,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EReference getLogicResult_Statistics() { return (EReference)logicResultEClass.getEStructuralFeatures().get(1); } @@ -224,6 +229,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getLogicResult_Trace() { return (EAttribute)logicResultEClass.getEStructuralFeatures().get(2); } @@ -233,6 +239,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getLogicResult_Representation() { return (EAttribute)logicResultEClass.getEStructuralFeatures().get(3); } @@ -242,6 +249,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getModelResult() { return modelResultEClass; } @@ -251,6 +259,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getModelResult_MaxInteger() { return (EAttribute)modelResultEClass.getEStructuralFeatures().get(0); } @@ -260,6 +269,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getModelResult_MinInteger() { return (EAttribute)modelResultEClass.getEStructuralFeatures().get(1); } @@ -269,6 +279,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getInconsistencyResult() { return inconsistencyResultEClass; } @@ -278,6 +289,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getUnknownResult() { return unknownResultEClass; } @@ -287,6 +299,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getInsuficientResourcesResult() { return insuficientResourcesResultEClass; } @@ -296,6 +309,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getInsuficientResourcesResult_ResourceName() { return (EAttribute)insuficientResourcesResultEClass.getEStructuralFeatures().get(0); } @@ -305,6 +319,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getErrorResult() { return errorResultEClass; } @@ -314,6 +329,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getErrorResult_Message() { return (EAttribute)errorResultEClass.getEStructuralFeatures().get(0); } @@ -323,6 +339,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getStatistics() { return statisticsEClass; } @@ -332,6 +349,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EReference getStatistics_Entries() { return (EReference)statisticsEClass.getEStructuralFeatures().get(0); } @@ -341,6 +359,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getStatistics_TransformationTime() { return (EAttribute)statisticsEClass.getEStructuralFeatures().get(1); } @@ -350,6 +369,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getStatistics_SolverTime() { return (EAttribute)statisticsEClass.getEStructuralFeatures().get(2); } @@ -359,6 +379,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getStatistics_SolverMemory() { return (EAttribute)statisticsEClass.getEStructuralFeatures().get(3); } @@ -368,6 +389,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getStatisticEntry() { return statisticEntryEClass; } @@ -377,6 +399,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getStatisticEntry_Name() { return (EAttribute)statisticEntryEClass.getEStructuralFeatures().get(0); } @@ -386,6 +409,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getUndecidableResult() { return undecidableResultEClass; } @@ -395,6 +419,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getIntStatisticEntry() { return intStatisticEntryEClass; } @@ -404,6 +429,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getIntStatisticEntry_Value() { return (EAttribute)intStatisticEntryEClass.getEStructuralFeatures().get(0); } @@ -413,6 +439,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getRealStatisticEntry() { return realStatisticEntryEClass; } @@ -422,6 +449,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getRealStatisticEntry_Value() { return (EAttribute)realStatisticEntryEClass.getEStructuralFeatures().get(0); } @@ -431,6 +459,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getStringStatisticEntry() { return stringStatisticEntryEClass; } @@ -440,6 +469,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getStringStatisticEntry_Value() { return (EAttribute)stringStatisticEntryEClass.getEStructuralFeatures().get(0); } @@ -449,6 +479,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public LogicresultFactory getLogicresultFactory() { return (LogicresultFactory)getEFactoryInstance(); } diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/ModelResultImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/ModelResultImpl.java index 63a15a81..5a601ae8 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/ModelResultImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/ModelResultImpl.java @@ -90,6 +90,7 @@ public class ModelResultImpl extends LogicResultImpl implements ModelResult { * * @generated */ + @Override public int getMaxInteger() { return maxInteger; } @@ -99,6 +100,7 @@ public class ModelResultImpl extends LogicResultImpl implements ModelResult { * * @generated */ + @Override public void setMaxInteger(int newMaxInteger) { int oldMaxInteger = maxInteger; maxInteger = newMaxInteger; @@ -111,6 +113,7 @@ public class ModelResultImpl extends LogicResultImpl implements ModelResult { * * @generated */ + @Override public int getMinInteger() { return minInteger; } @@ -120,6 +123,7 @@ public class ModelResultImpl extends LogicResultImpl implements ModelResult { * * @generated */ + @Override public void setMinInteger(int newMinInteger) { int oldMinInteger = minInteger; minInteger = newMinInteger; @@ -204,7 +208,7 @@ public class ModelResultImpl extends LogicResultImpl implements ModelResult { public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (maxInteger: "); result.append(maxInteger); result.append(", minInteger: "); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/RealStatisticEntryImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/RealStatisticEntryImpl.java index ed09f0df..464a3b1a 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/RealStatisticEntryImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/RealStatisticEntryImpl.java @@ -69,6 +69,7 @@ public class RealStatisticEntryImpl extends StatisticEntryImpl implements RealSt * * @generated */ + @Override public double getValue() { return value; } @@ -78,6 +79,7 @@ public class RealStatisticEntryImpl extends StatisticEntryImpl implements RealSt * * @generated */ + @Override public void setValue(double newValue) { double oldValue = value; value = newValue; @@ -152,7 +154,7 @@ public class RealStatisticEntryImpl extends StatisticEntryImpl implements RealSt public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StatisticEntryImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StatisticEntryImpl.java index bc1c5a92..e15e2a49 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StatisticEntryImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StatisticEntryImpl.java @@ -70,6 +70,7 @@ public abstract class StatisticEntryImpl extends MinimalEObjectImpl.Container im * * @generated */ + @Override public String getName() { return name; } @@ -79,6 +80,7 @@ public abstract class StatisticEntryImpl extends MinimalEObjectImpl.Container im * * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -153,7 +155,7 @@ public abstract class StatisticEntryImpl extends MinimalEObjectImpl.Container im public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StatisticsImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StatisticsImpl.java index 77d43c97..e0cce270 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StatisticsImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StatisticsImpl.java @@ -133,6 +133,7 @@ public class StatisticsImpl extends MinimalEObjectImpl.Container implements Stat * * @generated */ + @Override public EList getEntries() { if (entries == null) { entries = new EObjectContainmentEList(StatisticEntry.class, this, LogicresultPackage.STATISTICS__ENTRIES); @@ -145,6 +146,7 @@ public class StatisticsImpl extends MinimalEObjectImpl.Container implements Stat * * @generated */ + @Override public int getTransformationTime() { return transformationTime; } @@ -154,6 +156,7 @@ public class StatisticsImpl extends MinimalEObjectImpl.Container implements Stat * * @generated */ + @Override public void setTransformationTime(int newTransformationTime) { int oldTransformationTime = transformationTime; transformationTime = newTransformationTime; @@ -166,6 +169,7 @@ public class StatisticsImpl extends MinimalEObjectImpl.Container implements Stat * * @generated */ + @Override public int getSolverTime() { return solverTime; } @@ -175,6 +179,7 @@ public class StatisticsImpl extends MinimalEObjectImpl.Container implements Stat * * @generated */ + @Override public void setSolverTime(int newSolverTime) { int oldSolverTime = solverTime; solverTime = newSolverTime; @@ -187,6 +192,7 @@ public class StatisticsImpl extends MinimalEObjectImpl.Container implements Stat * * @generated */ + @Override public int getSolverMemory() { return solverMemory; } @@ -196,6 +202,7 @@ public class StatisticsImpl extends MinimalEObjectImpl.Container implements Stat * * @generated */ + @Override public void setSolverMemory(int newSolverMemory) { int oldSolverMemory = solverMemory; solverMemory = newSolverMemory; @@ -316,7 +323,7 @@ public class StatisticsImpl extends MinimalEObjectImpl.Container implements Stat public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (transformationTime: "); result.append(transformationTime); result.append(", solverTime: "); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StringStatisticEntryImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StringStatisticEntryImpl.java index 8698f73b..9011cf97 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StringStatisticEntryImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StringStatisticEntryImpl.java @@ -69,6 +69,7 @@ public class StringStatisticEntryImpl extends StatisticEntryImpl implements Stri * * @generated */ + @Override public String getValue() { return value; } @@ -78,6 +79,7 @@ public class StringStatisticEntryImpl extends StatisticEntryImpl implements Stri * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; value = newValue; @@ -152,7 +154,7 @@ public class StringStatisticEntryImpl extends StatisticEntryImpl implements Stri public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/figures/Terms.png b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/figures/Terms.png new file mode 100644 index 00000000..d3e27ad1 Binary files /dev/null and b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/figures/Terms.png differ 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 2a817e82..5673d66a 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 @@ -1,50 +1,50 @@ - + logiclanguage.ecore http://www.eclipse.org/emf/2002/Ecore logicproblem.ecore logicresult.ecore - + - + - + - + - + - + - + - + - + - + - - - + + + bold @@ -83,7 +83,7 @@ - + @@ -2138,1766 +2138,1766 @@ - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + bold - + - + bold - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + - + - + - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + bold - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + - + - + - + - + - + - + - + - + - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + italic - + - + - + - + - + - + italic - + - + - + - + - + - + - + - + - + - + - + - + italic - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + italic - + - + - + - + - + - + - + - + - + - + - + - + italic - + - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + bold - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + - + labelSize - + labelSize - + - - + + bold - + - + - - + + labelSize - + labelSize - + - + - + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + bold - + - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - - - - - + + + + + labelSize - + labelSize - - - - - + + + + + labelSize - + labelSize - + - - + + labelSize bold - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize bold - + labelSize - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - - - - + + + + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + italic - + - + - - + + bold - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - - + + + - + - - + + bold - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + italic - + - + - - - + + + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - + + bold - + - + - + - + italic - + - + - - + + bold - + - + - - + + bold - + - + - + - + - + - + italic - + - + - + - + labelSize - + labelSize - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + italic - + - + - + - + italic - + - + - + - + labelSize - + labelSize - + - + - + labelSize - + labelSize - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + italic - + - + - + - + labelSize - + labelSize - + - + - - + + - + - - + + labelSize bold - + labelSize - + - - + + bold - + bold - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + italic - + - + - - - + + + @@ -3913,24 +3913,23 @@ - - - - bold - - - - bold - - + + + bold + + - + + + + + @@ -3944,6 +3943,10 @@ + + + + @@ -3953,6 +3956,10 @@ + + + + @@ -3962,6 +3969,14 @@ + + + + + + + + @@ -3971,6 +3986,10 @@ + + + + @@ -3997,6 +4016,10 @@ + + + + @@ -4240,464 +4263,508 @@ - - - + + + - - + + - - + + - - - - - + + + + + - - - + + + - - + + - - + + - - - - - + + + + + - - - + + + - - + + - - + + - - - - - + + + + + - - - + + + - - + + - - + + - - - - - + + + + + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + + + + + + + + + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + bold + + + + + bold + + + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic + + + + + bold + + + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic + + + + + bold + + + + + + + + + + + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic + + + + + + + + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + bold - + - + bold - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + - - + + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + + + + + + + + + - + - - - + + + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - + + labelSize - + labelSize - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - - - - - - - bold - - - bold - + + + + + + + + - - - - - - - bold - - - bold - + + + + + + + + - - + + - - - bold - - - bold - + + + + - - + + - - - bold - - - bold - + + + + - + - - - + + + bold @@ -4706,7 +4773,7 @@ - + @@ -5051,339 +5118,339 @@ - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + bold - + - + bold - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + labelSize - + labelSize - + - + - + labelSize - + labelSize - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - + italic - + - + - + - - + + - + - + - - + + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + italic - + - + - - - + + + bold @@ -5411,11 +5478,15 @@ - + + + + + @@ -5434,6 +5505,10 @@ + + + + @@ -5474,6 +5549,10 @@ + + + + @@ -5483,6 +5562,10 @@ + + + + @@ -6024,531 +6107,563 @@ - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + + + + + + + + + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic + + + + + + + + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + bold - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic + + + + + + + + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic + + + + + + + + - + - - + + bold - + - + - - + + labelSize - + labelSize - + - - + + bold - + - + - - + + labelSize - + labelSize - + - - + + labelSize bold - + labelSize - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - + + - + italic - + - + - - + + bold - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - - + + + - + - - + + bold - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - + + - + italic - + - + - - - + + + - + - - + + labelSize bold - + labelSize - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - + + bold - + - + - - + + - + italic - + - + - - + + bold - + - + - - + + bold - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - + + - + italic - + - + - + - + labelSize - + labelSize - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - + + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - + + - + italic - + - + - - + + - + italic - + - + - + - + labelSize - + labelSize - + - + - + labelSize - + labelSize - + - - - + + + bold @@ -6566,7 +6681,7 @@ - + @@ -6579,6 +6694,10 @@ + + + + @@ -6878,371 +6997,403 @@ - + - + - + italic - + - + - + - - bold + + + + + + + + + + - + - + - + - + - + bold - + - + bold - + - + - + - + - + - + italic - + - + - + - + - + bold - + - + - + - + - + bold - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + bold - + - + bold - + - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + bold - + - + - + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + bold - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + bold - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + + + + - + italic - + - + - - + + + + + - + italic - + - + - - + + + + + - + italic - + - + - - + + + + + - + italic - + - + - - + + + + + - + italic - + - + - - + + + + + - + italic - + - + - - + + + + + - + italic - + - + - - + + + + + - + italic - + - + - - - + + + @@ -7270,7 +7421,7 @@ - + @@ -7279,7 +7430,7 @@ - + @@ -7288,7 +7439,7 @@ - + @@ -7297,7 +7448,7 @@ - + @@ -7310,7 +7461,7 @@ - + @@ -7323,7 +7474,7 @@ - + @@ -7336,7 +7487,7 @@ - + @@ -7345,7 +7496,7 @@ - + @@ -7354,7 +7505,7 @@ - + @@ -7363,7 +7514,7 @@ - + @@ -7372,7 +7523,7 @@ - + @@ -7381,7 +7532,7 @@ - + @@ -7390,7 +7541,7 @@ - + @@ -7399,7 +7550,7 @@ - + @@ -7408,7 +7559,7 @@ - + @@ -7417,7 +7568,7 @@ - + @@ -7426,7 +7577,7 @@ - + @@ -7435,7 +7586,7 @@ - + @@ -7444,7 +7595,7 @@ - + @@ -7453,7 +7604,7 @@ - + @@ -7462,7 +7613,7 @@ - + @@ -7471,7 +7622,7 @@ - + @@ -7480,7 +7631,7 @@ - + @@ -7489,7 +7640,7 @@ - + @@ -7498,7 +7649,7 @@ - + @@ -7507,7 +7658,7 @@ - + @@ -7516,7 +7667,7 @@ - + @@ -7525,7 +7676,7 @@ - + @@ -7534,7 +7685,7 @@ - + @@ -7543,7 +7694,7 @@ - + @@ -7552,7 +7703,7 @@ - + @@ -7561,7 +7712,7 @@ - + @@ -7570,7 +7721,7 @@ - + @@ -7579,7 +7730,7 @@ - + @@ -7588,7 +7739,7 @@ - + @@ -7601,7 +7752,7 @@ - + @@ -7610,7 +7761,7 @@ - + @@ -7623,7 +7774,7 @@ - + @@ -7636,376 +7787,443 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - + - + @@ -8020,7 +8238,7 @@ - + @@ -8035,9 +8253,9 @@ - - - + + + @@ -8053,7 +8271,7 @@ - + @@ -8069,7 +8287,7 @@ - + @@ -8085,7 +8303,7 @@ - + @@ -8101,7 +8319,7 @@ - + @@ -8115,9 +8333,9 @@ - - - + + + @@ -8132,8 +8350,8 @@ - - + + @@ -8148,8 +8366,8 @@ - - + + @@ -8164,8 +8382,8 @@ - - + + @@ -8180,8 +8398,8 @@ - - + + @@ -8196,8 +8414,8 @@ - - + + @@ -8212,8 +8430,8 @@ - - + + @@ -8228,24 +8446,24 @@ - - + + - + - + - + - - - + + + @@ -8260,8 +8478,8 @@ - - + + @@ -8276,24 +8494,24 @@ - - + + - + - + - + - - - + + + @@ -8308,8 +8526,8 @@ - - + + @@ -8324,8 +8542,8 @@ - - + + @@ -8340,8 +8558,8 @@ - - + + @@ -8356,24 +8574,24 @@ - - + + - + - + - + - + - + @@ -8388,8 +8606,8 @@ - - + + @@ -8404,8 +8622,8 @@ - - + + @@ -8420,8 +8638,8 @@ - - + + @@ -8435,9 +8653,9 @@ - - - + + + @@ -8452,24 +8670,24 @@ - - + + - + - + - + - - - + + + @@ -8485,39 +8703,39 @@ - + - + - + - + - + - + - + - + - + - - - + + + @@ -8533,55 +8751,55 @@ - + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + @@ -8596,8 +8814,8 @@ - - + + @@ -8613,55 +8831,55 @@ - + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + @@ -8676,8 +8894,8 @@ - - + + @@ -8692,24 +8910,24 @@ - + - + - + - + - - - + + + @@ -8719,29 +8937,29 @@ - + - - - + + + - + - + - + - + - + @@ -8756,1332 +8974,1669 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + - + - + bold - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + bold - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + bold - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + - + - + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - - - + + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + - + - + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + - + - + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + - + - + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - - - - - + + + + + labelSize - + labelSize - - - - - + + + + + labelSize - + labelSize - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - - - - + + + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + - - + + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - + + bold - + - + - - + + - + italic - + - + - - + + bold - + - + - - + + bold - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - + + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - + + bold - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - - + + labelSize bold - + labelSize - + - - + + bold - + - + - - + + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + bold - + - - + + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - + + labelSize - + labelSize - + - - + + labelSize - + labelSize - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + bold - + - + - + labelSize - + labelSize - + - - + + - + italic - + - + - - + + - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + - + - - + + labelSize - + labelSize - + - - + + - + italic - + - + - + - + labelSize - + labelSize - + - - + + + + + italic + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + italic + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + + italic + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + + italic + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + bold + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + - + italic - + - + 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 76624917..fdbc1c27 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 @@ -130,17 +130,17 @@ - + - - - - - + + + + + @@ -211,4 +211,18 @@ containment="true"/> + + + + + + + + + + + diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.genmodel b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.genmodel index 80550537..303080e7 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.genmodel +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.genmodel @@ -104,9 +104,9 @@ - - - + + + @@ -156,6 +156,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -171,8 +191,8 @@ - - + + diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logicproblem.aird b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logicproblem.aird index f71e8258..b100bd66 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logicproblem.aird +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logicproblem.aird @@ -1,29 +1,29 @@ - + logicproblem.ecore logiclanguage.ecore http://www.eclipse.org/emf/2002/Ecore - + - + - + - + - + - - - + + + @@ -47,7 +47,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -166,7 +166,7 @@ - + @@ -224,7 +224,7 @@ - + @@ -288,7 +288,7 @@ - + @@ -368,385 +368,385 @@ - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + - + - + - + italic - + - + bold - + - + bold - + - - + + labelSize - + labelSize - + - + - - + + - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - bold + + - + - - + + labelSize - + labelSize - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + bold - + - + - + - + - + - - + + labelSize - + labelSize - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + bold - + - + bold - + - + - + - - + + labelSize - + labelSize - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + - + - + - + - - + + labelSize - + labelSize - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - + bold - + - + - + - - + + labelSize - + labelSize - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - - - + + + - + - + - + labelSize - + labelSize - + - + - + labelSize - + labelSize - + - + - + labelSize - + labelSize - + - + - + labelSize - + labelSize - + diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logicresult.aird b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logicresult.aird index b088b72f..486a339f 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logicresult.aird +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logicresult.aird @@ -1,740 +1,758 @@ - - logicresult.ecore - logicproblem.ecore - http://www.eclipse.org/emf/2002/Ecore - logiclanguage.ecore - - - - - - - bold + + + logicresult.ecore + logicproblem.ecore + http://www.eclipse.org/emf/2002/Ecore + logiclanguage.ecore + + + + + + + + + + + + + + + + + + + + + + + bold + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - italic - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bold - - - - - - - - bold - - - - - - - - - - - - - - - - - italic - - - - - - - - - - - - - - - - bold - - - - - - - - - - - - - - - - bold - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - bold - - - - - - - - bold - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - italic - - - - - - - - bold - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + italic + + + + + + + + - - - - - - bold - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - + + + + + + + - - - - - - bold - - - - - - - - - - labelSize - - - labelSize - + + + + + + + - - - - - - - - labelSize - - - labelSize - + + + + + + + + + + + + + + + bold - - - - - - - - - italic - - + + + + + + + bold - - - - - - - - - italic - - + + + + + + + + + + + + + + + + italic + + + + + + + + + + + + + + + + bold - - - - - - - - - italic - - + + + + + + + + + + + + + + + bold - - - - - - - - - italic - - + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + bold - - - - - - - - - italic - - + + + + + + + bold - - - - - - - - - italic - - + + + + + + + - - - - - - - - - italic - - + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + bold - - - - - - - - - italic - - + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + bold - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + bold - - - - - - bold - - - - - - - - - - - italic - - + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + bold - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + italic + + + + + + + + + + + + + + -- cgit v1.2.3-54-g00ecf