From 28a7fda89898ec9d32d97efe7a0e111f36a8cf87 Mon Sep 17 00:00:00 2001 From: Oszkar Semerath Date: Thu, 7 May 2020 02:41:05 +0200 Subject: viatra parsing fixes --- .../TransfomedViatraQuery.java | 23 +++++++++ .../Viatra2LogicAnnotationsPackage.java | 30 +++++++++++- .../impl/TransfomedViatraQueryImpl.java | 54 ++++++++++++++++++++++ .../impl/Viatra2LogicAnnotationsPackageImpl.java | 12 +++++ 4 files changed, 118 insertions(+), 1 deletion(-) (limited to 'Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme') diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/TransfomedViatraQuery.java b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/TransfomedViatraQuery.java index 4ae4d79b..a4654103 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/TransfomedViatraQuery.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/TransfomedViatraQuery.java @@ -17,6 +17,7 @@ import org.eclipse.emf.common.util.EList; *
  • {@link hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransfomedViatraQuery#getPatternFullyQualifiedName Pattern Fully Qualified Name}
    • *
  • {@link hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransfomedViatraQuery#getPatternPQuery Pattern PQuery}
    • *
  • {@link hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransfomedViatraQuery#getVariableTrace Variable Trace}
    • + *
  • {@link hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransfomedViatraQuery#getOptimizedDisjunction Optimized Disjunction}
    • * * * @see hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.Viatra2LogicAnnotationsPackage#getTransfomedViatraQuery() @@ -88,4 +89,26 @@ public interface TransfomedViatraQuery extends RelationAnnotation { * @generated */ EList getVariableTrace(); + + /** + * Returns the value of the 'Optimized Disjunction' attribute. + * + * + * @return the value of the 'Optimized Disjunction' attribute. + * @see #setOptimizedDisjunction(Object) + * @see hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.Viatra2LogicAnnotationsPackage#getTransfomedViatraQuery_OptimizedDisjunction() + * @model required="true" transient="true" + * @generated + */ + Object getOptimizedDisjunction(); + + /** + * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransfomedViatraQuery#getOptimizedDisjunction Optimized Disjunction}' attribute. + * + * + * @param value the new value of the 'Optimized Disjunction' attribute. + * @see #getOptimizedDisjunction() + * @generated + */ + void setOptimizedDisjunction(Object value); } // TransfomedViatraQuery diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/Viatra2LogicAnnotationsPackage.java b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/Viatra2LogicAnnotationsPackage.java index ef83a6cc..a5dcda78 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/Viatra2LogicAnnotationsPackage.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/Viatra2LogicAnnotationsPackage.java @@ -104,6 +104,15 @@ public interface Viatra2LogicAnnotationsPackage extends EPackage { */ int TRANSFOMED_VIATRA_QUERY__VARIABLE_TRACE = LogicproblemPackage.RELATION_ANNOTATION_FEATURE_COUNT + 2; + /** + * The feature id for the 'Optimized Disjunction' attribute. + * + * + * @generated + * @ordered + */ + int TRANSFOMED_VIATRA_QUERY__OPTIMIZED_DISJUNCTION = LogicproblemPackage.RELATION_ANNOTATION_FEATURE_COUNT + 3; + /** * The number of structural features of the 'Transfomed Viatra Query' class. * @@ -111,7 +120,7 @@ public interface Viatra2LogicAnnotationsPackage extends EPackage { * @generated * @ordered */ - int TRANSFOMED_VIATRA_QUERY_FEATURE_COUNT = LogicproblemPackage.RELATION_ANNOTATION_FEATURE_COUNT + 3; + int TRANSFOMED_VIATRA_QUERY_FEATURE_COUNT = LogicproblemPackage.RELATION_ANNOTATION_FEATURE_COUNT + 4; /** * The number of operations of the 'Transfomed Viatra Query' class. @@ -306,6 +315,17 @@ public interface Viatra2LogicAnnotationsPackage extends EPackage { */ EReference getTransfomedViatraQuery_VariableTrace(); + /** + * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransfomedViatraQuery#getOptimizedDisjunction Optimized Disjunction}'. + * + * + * @return the meta object for the attribute 'Optimized Disjunction'. + * @see hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransfomedViatraQuery#getOptimizedDisjunction() + * @see #getTransfomedViatraQuery() + * @generated + */ + EAttribute getTransfomedViatraQuery_OptimizedDisjunction(); + /** * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransformedViatraWellformednessConstraint Transformed Viatra Wellformedness Constraint}'. * @@ -437,6 +457,14 @@ public interface Viatra2LogicAnnotationsPackage extends EPackage { */ EReference TRANSFOMED_VIATRA_QUERY__VARIABLE_TRACE = eINSTANCE.getTransfomedViatraQuery_VariableTrace(); + /** + * The meta object literal for the 'Optimized Disjunction' attribute feature. + * + * + * @generated + */ + EAttribute TRANSFOMED_VIATRA_QUERY__OPTIMIZED_DISJUNCTION = eINSTANCE.getTransfomedViatraQuery_OptimizedDisjunction(); + /** * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.impl.TransformedViatraWellformednessConstraintImpl Transformed Viatra Wellformedness Constraint}' class. * diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/impl/TransfomedViatraQueryImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/impl/TransfomedViatraQueryImpl.java index 469ba336..d0233450 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/impl/TransfomedViatraQueryImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/impl/TransfomedViatraQueryImpl.java @@ -29,6 +29,7 @@ import org.eclipse.emf.ecore.util.InternalEList; *
  • {@link hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.impl.TransfomedViatraQueryImpl#getPatternFullyQualifiedName Pattern Fully Qualified Name}
    • *
  • {@link hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.impl.TransfomedViatraQueryImpl#getPatternPQuery Pattern PQuery}
    • *
  • {@link hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.impl.TransfomedViatraQueryImpl#getVariableTrace Variable Trace}
    • + *
  • {@link hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.impl.TransfomedViatraQueryImpl#getOptimizedDisjunction Optimized Disjunction}
    • * * * @generated @@ -80,6 +81,24 @@ public class TransfomedViatraQueryImpl extends RelationAnnotationImpl implements * @ordered */ protected EList variableTrace; + /** + * The default value of the '{@link #getOptimizedDisjunction() Optimized Disjunction}' attribute. + * + * + * @see #getOptimizedDisjunction() + * @generated + * @ordered + */ + protected static final Object OPTIMIZED_DISJUNCTION_EDEFAULT = null; + /** + * The cached value of the '{@link #getOptimizedDisjunction() Optimized Disjunction}' attribute. + * + * + * @see #getOptimizedDisjunction() + * @generated + * @ordered + */ + protected Object optimizedDisjunction = OPTIMIZED_DISJUNCTION_EDEFAULT; /** * * @@ -158,6 +177,29 @@ public class TransfomedViatraQueryImpl extends RelationAnnotationImpl implements return variableTrace; } + /** + * + * + * @generated + */ + @Override + public Object getOptimizedDisjunction() { + return optimizedDisjunction; + } + + /** + * + * + * @generated + */ + @Override + public void setOptimizedDisjunction(Object newOptimizedDisjunction) { + Object oldOptimizedDisjunction = optimizedDisjunction; + optimizedDisjunction = newOptimizedDisjunction; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Viatra2LogicAnnotationsPackage.TRANSFOMED_VIATRA_QUERY__OPTIMIZED_DISJUNCTION, oldOptimizedDisjunction, optimizedDisjunction)); + } + /** * * @@ -186,6 +228,8 @@ public class TransfomedViatraQueryImpl extends RelationAnnotationImpl implements return getPatternPQuery(); case Viatra2LogicAnnotationsPackage.TRANSFOMED_VIATRA_QUERY__VARIABLE_TRACE: return getVariableTrace(); + case Viatra2LogicAnnotationsPackage.TRANSFOMED_VIATRA_QUERY__OPTIMIZED_DISJUNCTION: + return getOptimizedDisjunction(); } return super.eGet(featureID, resolve, coreType); } @@ -209,6 +253,9 @@ public class TransfomedViatraQueryImpl extends RelationAnnotationImpl implements getVariableTrace().clear(); getVariableTrace().addAll((Collection)newValue); return; + case Viatra2LogicAnnotationsPackage.TRANSFOMED_VIATRA_QUERY__OPTIMIZED_DISJUNCTION: + setOptimizedDisjunction(newValue); + return; } super.eSet(featureID, newValue); } @@ -230,6 +277,9 @@ public class TransfomedViatraQueryImpl extends RelationAnnotationImpl implements case Viatra2LogicAnnotationsPackage.TRANSFOMED_VIATRA_QUERY__VARIABLE_TRACE: getVariableTrace().clear(); return; + case Viatra2LogicAnnotationsPackage.TRANSFOMED_VIATRA_QUERY__OPTIMIZED_DISJUNCTION: + setOptimizedDisjunction(OPTIMIZED_DISJUNCTION_EDEFAULT); + return; } super.eUnset(featureID); } @@ -248,6 +298,8 @@ public class TransfomedViatraQueryImpl extends RelationAnnotationImpl implements return PATTERN_PQUERY_EDEFAULT == null ? patternPQuery != null : !PATTERN_PQUERY_EDEFAULT.equals(patternPQuery); case Viatra2LogicAnnotationsPackage.TRANSFOMED_VIATRA_QUERY__VARIABLE_TRACE: return variableTrace != null && !variableTrace.isEmpty(); + case Viatra2LogicAnnotationsPackage.TRANSFOMED_VIATRA_QUERY__OPTIMIZED_DISJUNCTION: + return OPTIMIZED_DISJUNCTION_EDEFAULT == null ? optimizedDisjunction != null : !OPTIMIZED_DISJUNCTION_EDEFAULT.equals(optimizedDisjunction); } return super.eIsSet(featureID); } @@ -266,6 +318,8 @@ public class TransfomedViatraQueryImpl extends RelationAnnotationImpl implements result.append(patternFullyQualifiedName); result.append(", patternPQuery: "); result.append(patternPQuery); + result.append(", optimizedDisjunction: "); + result.append(optimizedDisjunction); result.append(')'); return result.toString(); } diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/impl/Viatra2LogicAnnotationsPackageImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/impl/Viatra2LogicAnnotationsPackageImpl.java index 85474753..ae96f617 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/impl/Viatra2LogicAnnotationsPackageImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/impl/Viatra2LogicAnnotationsPackageImpl.java @@ -160,6 +160,16 @@ public class Viatra2LogicAnnotationsPackageImpl extends EPackageImpl implements return (EReference)transfomedViatraQueryEClass.getEStructuralFeatures().get(2); } + /** + * + * + * @generated + */ + @Override + public EAttribute getTransfomedViatraQuery_OptimizedDisjunction() { + return (EAttribute)transfomedViatraQueryEClass.getEStructuralFeatures().get(3); + } + /** * * @@ -263,6 +273,7 @@ public class Viatra2LogicAnnotationsPackageImpl extends EPackageImpl implements createEAttribute(transfomedViatraQueryEClass, TRANSFOMED_VIATRA_QUERY__PATTERN_FULLY_QUALIFIED_NAME); createEAttribute(transfomedViatraQueryEClass, TRANSFOMED_VIATRA_QUERY__PATTERN_PQUERY); createEReference(transfomedViatraQueryEClass, TRANSFOMED_VIATRA_QUERY__VARIABLE_TRACE); + createEAttribute(transfomedViatraQueryEClass, TRANSFOMED_VIATRA_QUERY__OPTIMIZED_DISJUNCTION); transformedViatraWellformednessConstraintEClass = createEClass(TRANSFORMED_VIATRA_WELLFORMEDNESS_CONSTRAINT); createEReference(transformedViatraWellformednessConstraintEClass, TRANSFORMED_VIATRA_WELLFORMEDNESS_CONSTRAINT__QUERY); @@ -316,6 +327,7 @@ public class Viatra2LogicAnnotationsPackageImpl extends EPackageImpl implements initEAttribute(getTransfomedViatraQuery_PatternFullyQualifiedName(), ecorePackage.getEString(), "patternFullyQualifiedName", null, 1, 1, TransfomedViatraQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTransfomedViatraQuery_PatternPQuery(), ecorePackage.getEJavaObject(), "patternPQuery", null, 1, 1, TransfomedViatraQuery.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getTransfomedViatraQuery_VariableTrace(), this.getVariableMapping(), null, "variableTrace", null, 0, -1, TransfomedViatraQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTransfomedViatraQuery_OptimizedDisjunction(), ecorePackage.getEJavaObject(), "optimizedDisjunction", null, 1, 1, TransfomedViatraQuery.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(transformedViatraWellformednessConstraintEClass, TransformedViatraWellformednessConstraint.class, "TransformedViatraWellformednessConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getTransformedViatraWellformednessConstraint_Query(), this.getTransfomedViatraQuery(), null, "query", null, 1, 1, TransformedViatraWellformednessConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); -- cgit v1.2.3-54-g00ecf