From 3e7fdbf562bbb1739a6ff4b09f86f415aaf89a56 Mon Sep 17 00:00:00 2001
From: OszkarSemerath <semerath@mit.bme.hu>
Date: Sat, 4 May 2019 15:31:47 -0400
Subject: Added aggregate expressions to logic language on the model level

---
 .../model/logiclanguage.ecore                      | 26 +++++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore')

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 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="rightOperand" eType="#//Term"
         containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IntOperation" abstract="true" eSuperTypes="#//Term">
+  <eClassifiers xsi:type="ecore:EClass" name="NumericOperation" abstract="true" eSuperTypes="#//Term">
     <eStructuralFeatures xsi:type="ecore:EReference" name="leftOperand" eType="#//Term"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="rightOperand" eType="#//Term"
         containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Plus" eSuperTypes="#//IntOperation"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Minus" eSuperTypes="#//IntOperation"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Multiply" eSuperTypes="#//IntOperation"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Divison" eSuperTypes="#//IntOperation"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Mod" eSuperTypes="#//IntOperation"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Plus" eSuperTypes="#//NumericOperation"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Minus" eSuperTypes="#//NumericOperation"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Multiply" eSuperTypes="#//NumericOperation"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Divison" eSuperTypes="#//NumericOperation"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Mod" eSuperTypes="#//NumericOperation"/>
   <eClassifiers xsi:type="ecore:EClass" name="TypeDescriptor" abstract="true" interface="true"/>
   <eClassifiers xsi:type="ecore:EClass" name="TermDescription" abstract="true" interface="true"/>
   <eClassifiers xsi:type="ecore:EClass" name="Assertion">
@@ -211,4 +211,18 @@
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Pow" eSuperTypes="#//NumericOperation"/>
+  <eClassifiers xsi:type="ecore:EClass" name="AggregateExpression" abstract="true"
+      eSuperTypes="#//Term">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Sum" eSuperTypes="#//ProjectedAggregateExpression"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Count" eSuperTypes="#//AggregateExpression"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Min" eSuperTypes="#//ProjectedAggregateExpression"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Max" eSuperTypes="#//ProjectedAggregateExpression"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ProjectedAggregateExpression" abstract="true"
+      eSuperTypes="#//AggregateExpression">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="projectionIndex" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="-1"/>
+  </eClassifiers>
 </ecore:EPackage>
-- 
cgit v1.2.3-54-g00ecf