parsing count, min, max, check and eval v1

8 files changed, 232 insertions, 17 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);

 

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 0a49e388..e96b4586 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
@@ -9146,6 +9146,22 @@
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__oOVoKJfEemXzuA5M0BZIw" id="(0.6082949308755761,1.0)"/>

           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__oOVoaJfEemXzuA5M0BZIw" id="(1.0,0.3076923076923077)"/>

         </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_QZPVkKJ9EemXzuA5M0BZIw" type="4001" element="_QYZBAKJ9EemXzuA5M0BZIw" source="_rsImoG6WEemSyfDlsGAqLA" target="_l6XSGLdnEeau1vMV3Bsx4w">

+          <children xmi:type="notation:Node" xmi:id="_QZP8oKJ9EemXzuA5M0BZIw" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QZP8oaJ9EemXzuA5M0BZIw" x="-12" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_QZP8oqJ9EemXzuA5M0BZIw" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QZP8o6J9EemXzuA5M0BZIw" x="4" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_QZQjsKJ9EemXzuA5M0BZIw" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QZQjsaJ9EemXzuA5M0BZIw" x="-4" y="10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_QZPVkaJ9EemXzuA5M0BZIw" routing="Rectilinear"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_QZPVkqJ9EemXzuA5M0BZIw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QZPVk6J9EemXzuA5M0BZIw" points="[-36, 0, 206, -76]$[-36, 89, 206, 13]$[-242, 89, 0, 13]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QZQjsqJ9EemXzuA5M0BZIw" id="(0.2706766917293233,1.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QZQjs6J9EemXzuA5M0BZIw" id="(1.0,0.6153846153846154)"/>

+        </edges>

       </data>

     </ownedAnnotationEntries>

     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIGbdnEeau1vMV3Bsx4w" name="Term" tooltipText="" outgoingEdges="_l6ZufbdnEeau1vMV3Bsx4w" incomingEdges="_l6Zt6bdnEeau1vMV3Bsx4w _l6Zt9bdnEeau1vMV3Bsx4w _l6Zt-bdnEeau1vMV3Bsx4w _l6Zt_bdnEeau1vMV3Bsx4w _l6ZuAbdnEeau1vMV3Bsx4w _l6ZuBbdnEeau1vMV3Bsx4w _l6ZuCbdnEeau1vMV3Bsx4w _l6ZuDbdnEeau1vMV3Bsx4w _l6ZuEbdnEeau1vMV3Bsx4w _l6ZuFbdnEeau1vMV3Bsx4w _l6ZuGbdnEeau1vMV3Bsx4w _l6ZuHbdnEeau1vMV3Bsx4w _l6ZuIbdnEeau1vMV3Bsx4w _l6ZuJbdnEeau1vMV3Bsx4w _l6ZuKbdnEeau1vMV3Bsx4w _l6ZuLbdnEeau1vMV3Bsx4w _l6ZuMbdnEeau1vMV3Bsx4w _l6ZuNbdnEeau1vMV3Bsx4w _l6ZuObdnEeau1vMV3Bsx4w _l6ZuPbdnEeau1vMV3Bsx4w _l6ZuQbdnEeau1vMV3Bsx4w _l6ZuRbdnEeau1vMV3Bsx4w _l6ZuhbdnEeau1vMV3Bsx4w _l6ZuibdnEeau1vMV3Bsx4w _l6ZunbdnEeau1vMV3Bsx4w _l6ZuqbdnEeau1vMV3Bsx4w _l6ZuwbdnEeau1vMV3Bsx4w _l6Zu3bdnEeau1vMV3Bsx4w _l6ZvHbdnEeau1vMV3Bsx4w _l6ZvIbdnEeau1vMV3Bsx4w _l6ZvJbdnEeau1vMV3Bsx4w _l6ZvKbdnEeau1vMV3Bsx4w _l6ZvZ7dnEeau1vMV3Bsx4w _kQZhsLd1Eeau1vMV3Bsx4w _BoaVwLqxEeau1vMV3Bsx4w _Vi5psIKgEeeAppuRs-roLg _YRIxkIKgEeeAppuRs-roLg _sGSk0IKlEeeAppuRs-roLg _za0wsm6WEemSyfDlsGAqLA" width="12" height="10">

@@ -9240,7 +9256,7 @@
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>

       </ownedElements>

     </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIL7dnEeau1vMV3Bsx4w" name="Variable" tooltipText="" outgoingEdges="_JfkfULd8Eeau1vMV3Bsx4w _e1jg0IKgEeeAppuRs-roLg" incomingEdges="_l6Zt8bdnEeau1vMV3Bsx4w __nLz2aJfEemXzuA5M0BZIw" width="12" height="10">

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIL7dnEeau1vMV3Bsx4w" name="Variable" tooltipText="" outgoingEdges="_JfkfULd8Eeau1vMV3Bsx4w _e1jg0IKgEeeAppuRs-roLg" incomingEdges="_l6Zt8bdnEeau1vMV3Bsx4w __nLz2aJfEemXzuA5M0BZIw _QYZBAKJ9EemXzuA5M0BZIw" width="12" height="10">

       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/>

       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/>

       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

@@ -10514,7 +10530,7 @@
       </ownedStyle>

       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

     </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_rrY_wG6WEemSyfDlsGAqLA" name="AggregateExpression" tooltipText="" outgoingEdges="_za0wsm6WEemSyfDlsGAqLA _hJ8ymW6cEemSyfDlsGAqLA _uI5YDKJfEemXzuA5M0BZIw" incomingEdges="_wovb6G6cEemSyfDlsGAqLA _OKfpkm6dEemSyfDlsGAqLA" width="12" height="10">

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_rrY_wG6WEemSyfDlsGAqLA" name="AggregateExpression" tooltipText="" outgoingEdges="_za0wsm6WEemSyfDlsGAqLA _hJ8ymW6cEemSyfDlsGAqLA _uI5YDKJfEemXzuA5M0BZIw _QYZBAKJ9EemXzuA5M0BZIw" incomingEdges="_wovb6G6cEemSyfDlsGAqLA _OKfpkm6dEemSyfDlsGAqLA" width="12" height="10">

       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//AggregateExpression"/>

       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//AggregateExpression"/>

       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

@@ -10714,6 +10730,20 @@
       </ownedStyle>

       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>

     </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_QYZBAKJ9EemXzuA5M0BZIw" name="[0..1] resultVariable" sourceNode="_rrY_wG6WEemSyfDlsGAqLA" targetNode="_l6ZIL7dnEeau1vMV3Bsx4w">

+      <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//AggregateExpression/resultVariable"/>

+      <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//AggregateExpression/resultVariable"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_QYZBAaJ9EemXzuA5M0BZIw" routingStyle="manhattan" strokeColor="0,0,0">

+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_QYZBA6J9EemXzuA5M0BZIw" showIcon="false">

+          <customFeatures>labelSize</customFeatures>

+        </centerLabelStyle>

+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_QYZBAqJ9EemXzuA5M0BZIw" showIcon="false" labelColor="39,76,114">

+          <customFeatures>labelSize</customFeatures>

+        </endLabelStyle>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>

+    </ownedDiagramElements>

     <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>

     <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_l6Zva7dnEeau1vMV3Bsx4w"/>

     <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>

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 fb94b598..a91d4407 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
@@ -217,6 +217,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="parameterSubstitution"

         upperBound="-1" eType="#//AggregatedParameterSubstitution" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="resultVariable" eType="#//Variable"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Sum" eSuperTypes="#//ProjectedAggregateExpression"/>

   <eClassifiers xsi:type="ecore:EClass" name="Count" eSuperTypes="#//AggregateExpression"/>

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 cb14ae5b..0f35db7c 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
@@ -169,6 +169,7 @@
     <genClasses image="false" ecoreClass="logiclanguage.ecore#//AggregateExpression">

       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference logiclanguage.ecore#//AggregateExpression/relation"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference logiclanguage.ecore#//AggregateExpression/parameterSubstitution"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference logiclanguage.ecore#//AggregateExpression/resultVariable"/>

     </genClasses>

     <genClasses ecoreClass="logiclanguage.ecore#//Sum"/>

     <genClasses ecoreClass="logiclanguage.ecore#//Count"/>

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend
index 09bfbb39..a231af3c 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend
@@ -478,6 +478,7 @@ class LogicProblemBuilder{
         def %(TermDescription left, TermDescription right) { Modulo(left,right) }

         def Modulo(TermDescription left, TermDescription right) { createMod => [leftOperand = left.toTerm rightOperand = right.toTerm]}

         

+        def Pow(TermDescription left, TermDescription right) {createPow => [leftOperand = left.toTerm rightOperand = right.toTerm]}

         def asTerm(boolean value) { createBoolLiteral => [x|x.value = value]  }

         def asTerm(int value) { createIntLiteral => [x|x.value = value] }

         def asTerm(double value) { BigDecimal.valueOf(value).asTerm }

@@ -530,27 +531,28 @@ class LogicProblemBuilder{
         

         // AggregatedExpression

         

-        private def <T extends AggregateExpression> configureAggregateExpression(T expression, Relation referred, List<Variable> terms) {

+        private def <T extends AggregateExpression> configureAggregateExpression(T expression, Relation referred, List<Variable> terms, Variable target) {

                 if(terms.size != referred.parameters.size) {

                         throw new LogicProblemBuilderException(

                         '''The function called has «referred.parameters.size» parameters but it is called with «terms.size»!''')

                 } else {

                         expression.relation = referred

+                        expression.resultVariable = target

                         for(var i=0; i<referred.parameters.size;i++) {

-                                val target = terms.get(i)

-                                val substitution = createAggregatedParameterSubstitution => [it.variable = target]

+                                val targetRelation = terms.get(i)

+                                val substitution = createAggregatedParameterSubstitution => [it.variable = targetRelation]

                                 expression.parameterSubstitution += substitution

                         }

                         return expression

                 }

         }

-        private def <T extends ProjectedAggregateExpression> configureProjectedAggregateExpression(T expression, Relation referred, List<Variable> terms, int projection) {

+        private def <T extends ProjectedAggregateExpression> configureProjectedAggregateExpression(T expression, Relation referred, List<Variable> terms, Variable target, int projection) {

                 if(projection < 0 || projection >= referred.parameters.size) {

                         throw new LogicProblemBuilderException(

                         '''The function called has «referred.parameters.size» parameters but it is called with «terms.size»!''')

                 } else {

-                        val res = expression.configureAggregateExpression(referred, terms)

-                        if(res.parameterSubstitution.get(projection) !== null) {

+                        val res = expression.configureAggregateExpression(referred, terms,target)

+                        if(res.parameterSubstitution.get(projection).variable !== null) {

                                 throw new LogicProblemBuilderException(

                                 '''Projection over set variable!''')

                         }

@@ -564,10 +566,18 @@ class LogicProblemBuilder{
                 }

                 

         }

-        def Count(Relation referred, List<Variable> terms) { createCount.configureAggregateExpression(referred,terms) }

-        def Sum(Relation referred,  List<Variable> terms, int projection) { createSum.configureProjectedAggregateExpression(referred,terms,projection) }

-        def Min(Relation referred,  List<Variable> terms, int projection) { createMin.configureProjectedAggregateExpression(referred,terms,projection) }

-        def Max(Relation referred,  List<Variable> terms, int projection) { createMax.configureProjectedAggregateExpression(referred,terms,projection) }

+        def Count(Relation referred, List<Variable> terms, Variable result) {

+                createCount.configureAggregateExpression(referred,terms,result)

+        }

+        def Sum(Relation referred,  List<Variable> terms, int projection, Variable result) {

+                createSum.configureProjectedAggregateExpression(referred,terms,result,projection)

+        }

+        def Min(Relation referred,  List<Variable> terms, int projection, Variable result) {

+                createMin.configureProjectedAggregateExpression(referred,terms,result,projection)

+        }

+        def Max(Relation referred,  List<Variable> terms, int projection, Variable result) {

+                createMax.configureProjectedAggregateExpression(referred,terms,result,projection)

+        }

         

         // Function calls

         def call(Function function, TermDescription... substitutions) {

@@ -592,17 +602,19 @@ class LogicProblemBuilder{
         def call(Relation relation, TermDescription... substitution) { relation.call(substitution as Iterable<? extends TermDescription>)}

         def call(Relation relation, Iterable<? extends TermDescription> substitution) {

                 val relationReference = createSymbolicValue

+                if(relation === null) {

+                        throw new LogicProblemBuilderException('''Call is referring to null!''')

+                }

                 relationReference.symbolicReference = relation

-                //println('''«relation.name»(«substitution.size»->«relation.parameters»)''')

                 for(value : substitution)

                         relationReference.parameterSubstitutions += value.toTerm

                 relationReference.checkRelationCall(relation)

                 return relationReference

         }

         def private checkRelationCall(SymbolicValue value, Relation referredRelation) {

-//              if(value === null || referredRelation === null) {

-//                      println("gebasz")

-//              }

+                if(value === null || referredRelation === null) {

+                        throw new LogicProblemBuilderException('''Call is referring to null!''')

+                }

                 if(value.parameterSubstitutions.size != referredRelation.parameters.size) {

                         throw new LogicProblemBuilderException(

                                 '''The relation "«referredRelation.name»" called has «referredRelation.parameters.size» parameters but it is called with «value.parameterSubstitutions.size»!''')