parsing count, min, max, check and eval v1

4 files changed, 172 insertions, 1 deletions

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
index 4b38becf..589145c3 100644
--- 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
@@ -16,6 +16,7 @@ import org.eclipse.emf.common.util.EList;
  * <ul>

  *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.AggregateExpression#getRelation <em>Relation</em>}</li>

  *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.AggregateExpression#getParameterSubstitution <em>Parameter Substitution</em>}</li>

+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.AggregateExpression#getResultVariable <em>Result Variable</em>}</li>

  * </ul>

  *

  * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getAggregateExpression()

@@ -61,4 +62,26 @@ public interface AggregateExpression extends Term {
          */

         EList<AggregatedParameterSubstitution> getParameterSubstitution();

 

+        /**

+         * Returns the value of the '<em><b>Result Variable</b></em>' reference.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return the value of the '<em>Result Variable</em>' reference.

+         * @see #setResultVariable(Variable)

+         * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getAggregateExpression_ResultVariable()

+         * @model

+         * @generated

+         */

+        Variable getResultVariable();

+

+        /**

+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.AggregateExpression#getResultVariable <em>Result Variable</em>}' reference.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @param value the new value of the '<em>Result Variable</em>' reference.

+         * @see #getResultVariable()

+         * @generated

+         */

+        void setResultVariable(Variable value);

+

 } // AggregateExpression

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 f5347e31..193d9bdd 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
@@ -2760,13 +2760,22 @@ public interface LogiclanguagePackage extends EPackage {
         int AGGREGATE_EXPRESSION__PARAMETER_SUBSTITUTION = TERM_FEATURE_COUNT + 1;

 

         /**

+         * The feature id for the '<em><b>Result Variable</b></em>' reference.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         * @ordered

+         */

+        int AGGREGATE_EXPRESSION__RESULT_VARIABLE = TERM_FEATURE_COUNT + 2;

+

+        /**

          * The number of structural features of the '<em>Aggregate Expression</em>' class.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @generated

          * @ordered

          */

-        int AGGREGATE_EXPRESSION_FEATURE_COUNT = TERM_FEATURE_COUNT + 2;

+        int AGGREGATE_EXPRESSION_FEATURE_COUNT = TERM_FEATURE_COUNT + 3;

 

         /**

          * The number of operations of the '<em>Aggregate Expression</em>' class.

@@ -2806,6 +2815,15 @@ public interface LogiclanguagePackage extends EPackage {
         int PROJECTED_AGGREGATE_EXPRESSION__PARAMETER_SUBSTITUTION = AGGREGATE_EXPRESSION__PARAMETER_SUBSTITUTION;

 

         /**

+         * The feature id for the '<em><b>Result Variable</b></em>' reference.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         * @ordered

+         */

+        int PROJECTED_AGGREGATE_EXPRESSION__RESULT_VARIABLE = AGGREGATE_EXPRESSION__RESULT_VARIABLE;

+

+        /**

          * The feature id for the '<em><b>Projection Index</b></em>' attribute.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

@@ -2861,6 +2879,15 @@ public interface LogiclanguagePackage extends EPackage {
         int SUM__PARAMETER_SUBSTITUTION = PROJECTED_AGGREGATE_EXPRESSION__PARAMETER_SUBSTITUTION;

 

         /**

+         * The feature id for the '<em><b>Result Variable</b></em>' reference.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         * @ordered

+         */

+        int SUM__RESULT_VARIABLE = PROJECTED_AGGREGATE_EXPRESSION__RESULT_VARIABLE;

+

+        /**

          * The feature id for the '<em><b>Projection Index</b></em>' attribute.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

@@ -2916,6 +2943,15 @@ public interface LogiclanguagePackage extends EPackage {
         int COUNT__PARAMETER_SUBSTITUTION = AGGREGATE_EXPRESSION__PARAMETER_SUBSTITUTION;

 

         /**

+         * The feature id for the '<em><b>Result Variable</b></em>' reference.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         * @ordered

+         */

+        int COUNT__RESULT_VARIABLE = AGGREGATE_EXPRESSION__RESULT_VARIABLE;

+

+        /**

          * The number of structural features of the '<em>Count</em>' class.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

@@ -2962,6 +2998,15 @@ public interface LogiclanguagePackage extends EPackage {
         int MIN__PARAMETER_SUBSTITUTION = PROJECTED_AGGREGATE_EXPRESSION__PARAMETER_SUBSTITUTION;

 

         /**

+         * The feature id for the '<em><b>Result Variable</b></em>' reference.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         * @ordered

+         */

+        int MIN__RESULT_VARIABLE = PROJECTED_AGGREGATE_EXPRESSION__RESULT_VARIABLE;

+

+        /**

          * The feature id for the '<em><b>Projection Index</b></em>' attribute.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

@@ -3017,6 +3062,15 @@ public interface LogiclanguagePackage extends EPackage {
         int MAX__PARAMETER_SUBSTITUTION = PROJECTED_AGGREGATE_EXPRESSION__PARAMETER_SUBSTITUTION;

 

         /**

+         * The feature id for the '<em><b>Result Variable</b></em>' reference.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         * @ordered

+         */

+        int MAX__RESULT_VARIABLE = PROJECTED_AGGREGATE_EXPRESSION__RESULT_VARIABLE;

+

+        /**

          * The feature id for the '<em><b>Projection Index</b></em>' attribute.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

@@ -4409,6 +4463,17 @@ public interface LogiclanguagePackage extends EPackage {
         EReference getAggregateExpression_ParameterSubstitution();

 

         /**

+         * Returns the meta object for the reference '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.AggregateExpression#getResultVariable <em>Result Variable</em>}'.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return the meta object for the reference '<em>Result Variable</em>'.

+         * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.AggregateExpression#getResultVariable()

+         * @see #getAggregateExpression()

+         * @generated

+         */

+        EReference getAggregateExpression_ResultVariable();

+

+        /**

          * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Sum <em>Sum</em>}'.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

@@ -5642,6 +5707,14 @@ public interface LogiclanguagePackage extends EPackage {
                 EReference AGGREGATE_EXPRESSION__PARAMETER_SUBSTITUTION = eINSTANCE.getAggregateExpression_ParameterSubstitution();

 

                 /**

+                 * The meta object literal for the '<em><b>Result Variable</b></em>' reference feature.

+                 * <!-- begin-user-doc -->

+                 * <!-- end-user-doc -->

+                 * @generated

+                 */

+                EReference AGGREGATE_EXPRESSION__RESULT_VARIABLE = eINSTANCE.getAggregateExpression_ResultVariable();

+

+                /**

                  * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.SumImpl <em>Sum</em>}' class.

                  * <!-- begin-user-doc -->

                  * <!-- end-user-doc -->

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
index 0459af42..31155b84 100644
--- 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
@@ -7,6 +7,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.AggregatedParameterS
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Relation;

 

+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Variable;

 import java.util.Collection;

 import org.eclipse.emf.common.notify.Notification;

 

@@ -29,6 +30,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <ul>

  *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.AggregateExpressionImpl#getRelation <em>Relation</em>}</li>

  *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.AggregateExpressionImpl#getParameterSubstitution <em>Parameter Substitution</em>}</li>

+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.AggregateExpressionImpl#getResultVariable <em>Result Variable</em>}</li>

  * </ul>

  *

  * @generated

@@ -55,6 +57,16 @@ public abstract class AggregateExpressionImpl extends TermImpl implements Aggreg
         protected EList<AggregatedParameterSubstitution> parameterSubstitution;

 

         /**

+         * The cached value of the '{@link #getResultVariable() <em>Result Variable</em>}' reference.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @see #getResultVariable()

+         * @generated

+         * @ordered

+         */

+        protected Variable resultVariable;

+

+        /**

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @generated

@@ -132,6 +144,46 @@ public abstract class AggregateExpressionImpl extends TermImpl implements Aggreg
          * @generated

          */

         @Override

+        public Variable getResultVariable() {

+                if (resultVariable != null && resultVariable.eIsProxy()) {

+                        InternalEObject oldResultVariable = (InternalEObject)resultVariable;

+                        resultVariable = (Variable)eResolveProxy(oldResultVariable);

+                        if (resultVariable != oldResultVariable) {

+                                if (eNotificationRequired())

+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, LogiclanguagePackage.AGGREGATE_EXPRESSION__RESULT_VARIABLE, oldResultVariable, resultVariable));

+                        }

+                }

+                return resultVariable;

+        }

+

+        /**

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         */

+        public Variable basicGetResultVariable() {

+                return resultVariable;

+        }

+

+        /**

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         */

+        @Override

+        public void setResultVariable(Variable newResultVariable) {

+                Variable oldResultVariable = resultVariable;

+                resultVariable = newResultVariable;

+                if (eNotificationRequired())

+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.AGGREGATE_EXPRESSION__RESULT_VARIABLE, oldResultVariable, resultVariable));

+        }

+

+        /**

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         */

+        @Override

         public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

                 switch (featureID) {

                         case LogiclanguagePackage.AGGREGATE_EXPRESSION__PARAMETER_SUBSTITUTION:

@@ -153,6 +205,9 @@ public abstract class AggregateExpressionImpl extends TermImpl implements Aggreg
                                 return basicGetRelation();

                         case LogiclanguagePackage.AGGREGATE_EXPRESSION__PARAMETER_SUBSTITUTION:

                                 return getParameterSubstitution();

+                        case LogiclanguagePackage.AGGREGATE_EXPRESSION__RESULT_VARIABLE:

+                                if (resolve) return getResultVariable();

+                                return basicGetResultVariable();

                 }

                 return super.eGet(featureID, resolve, coreType);

         }

@@ -173,6 +228,9 @@ public abstract class AggregateExpressionImpl extends TermImpl implements Aggreg
                                 getParameterSubstitution().clear();

                                 getParameterSubstitution().addAll((Collection<? extends AggregatedParameterSubstitution>)newValue);

                                 return;

+                        case LogiclanguagePackage.AGGREGATE_EXPRESSION__RESULT_VARIABLE:

+                                setResultVariable((Variable)newValue);

+                                return;

                 }

                 super.eSet(featureID, newValue);

         }

@@ -191,6 +249,9 @@ public abstract class AggregateExpressionImpl extends TermImpl implements Aggreg
                         case LogiclanguagePackage.AGGREGATE_EXPRESSION__PARAMETER_SUBSTITUTION:

                                 getParameterSubstitution().clear();

                                 return;

+                        case LogiclanguagePackage.AGGREGATE_EXPRESSION__RESULT_VARIABLE:

+                                setResultVariable((Variable)null);

+                                return;

                 }

                 super.eUnset(featureID);

         }

@@ -207,6 +268,8 @@ public abstract class AggregateExpressionImpl extends TermImpl implements Aggreg
                                 return relation != null;

                         case LogiclanguagePackage.AGGREGATE_EXPRESSION__PARAMETER_SUBSTITUTION:

                                 return parameterSubstitution != null && !parameterSubstitution.isEmpty();

+                        case LogiclanguagePackage.AGGREGATE_EXPRESSION__RESULT_VARIABLE:

+                                return resultVariable != null;

                 }

                 return super.eIsSet(featureID);

         }

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 64ebdde1..03a679e4 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
@@ -1892,6 +1892,16 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu
          * @generated

          */

         @Override

+        public EReference getAggregateExpression_ResultVariable() {

+                return (EReference)aggregateExpressionEClass.getEStructuralFeatures().get(2);

+        }

+

+        /**

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         */

+        @Override

         public EClass getSum() {

                 return sumEClass;

         }

@@ -2180,6 +2190,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu
                 aggregateExpressionEClass = createEClass(AGGREGATE_EXPRESSION);

                 createEReference(aggregateExpressionEClass, AGGREGATE_EXPRESSION__RELATION);

                 createEReference(aggregateExpressionEClass, AGGREGATE_EXPRESSION__PARAMETER_SUBSTITUTION);

+                createEReference(aggregateExpressionEClass, AGGREGATE_EXPRESSION__RESULT_VARIABLE);

 

                 sumEClass = createEClass(SUM);

 

@@ -2476,6 +2487,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu
                 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);

                 initEReference(getAggregateExpression_ParameterSubstitution(), this.getAggregatedParameterSubstitution(), null, "parameterSubstitution", null, 0, -1, AggregateExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEReference(getAggregateExpression_ResultVariable(), this.getVariable(), null, "resultVariable", 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);