diff options
| author |  OszkarSemerath <semerath@mit.bme.hu> | 2019-05-04 15:31:47 -0400 |
|---|---|---|
| committer | OszkarSemerath <semerath@mit.bme.hu> | 2019-05-04 15:31:47 -0400 |
| commit | 3e7fdbf562bbb1739a6ff4b09f86f415aaf89a56 (patch) | |
| tree | bef27ef38448443d5342fa5ea25700fc1b40ea1f /Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore | |
| parent | Fixed misformalization of (may/must)(X!=Y) for abstract objects (diff) | |
| download | VIATRA-Generator-3e7fdbf562bbb1739a6ff4b09f86f415aaf89a56.tar.gz VIATRA-Generator-3e7fdbf562bbb1739a6ff4b09f86f415aaf89a56.tar.zst VIATRA-Generator-3e7fdbf562bbb1739a6ff4b09f86f415aaf89a56.zip | |
Added aggregate expressions to logic language on the model level
Diffstat (limited to 'Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore')
| -rw-r--r-- | Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore | 26 |
1 files changed, 20 insertions, 6 deletions
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 @@ | |||
| 130 | <eStructuralFeatures xsi:type="ecore:EReference" name="rightOperand" eType="#//Term" | 130 | <eStructuralFeatures xsi:type="ecore:EReference" name="rightOperand" eType="#//Term" |
| 131 | containment="true"/> | 131 | containment="true"/> |
| 132 | </eClassifiers> | 132 | </eClassifiers> |
| 133 | <eClassifiers xsi:type="ecore:EClass" name="IntOperation" abstract="true" eSuperTypes="#//Term"> | 133 | <eClassifiers xsi:type="ecore:EClass" name="NumericOperation" abstract="true" eSuperTypes="#//Term"> |
| 134 | <eStructuralFeatures xsi:type="ecore:EReference" name="leftOperand" eType="#//Term" | 134 | <eStructuralFeatures xsi:type="ecore:EReference" name="leftOperand" eType="#//Term" |
| 135 | containment="true"/> | 135 | containment="true"/> |
| 136 | <eStructuralFeatures xsi:type="ecore:EReference" name="rightOperand" eType="#//Term" | 136 | <eStructuralFeatures xsi:type="ecore:EReference" name="rightOperand" eType="#//Term" |
| 137 | containment="true"/> | 137 | containment="true"/> |
| 138 | </eClassifiers> | 138 | </eClassifiers> |
| 139 | <eClassifiers xsi:type="ecore:EClass" name="Plus" eSuperTypes="#//IntOperation"/> | 139 | <eClassifiers xsi:type="ecore:EClass" name="Plus" eSuperTypes="#//NumericOperation"/> |
| 140 | <eClassifiers xsi:type="ecore:EClass" name="Minus" eSuperTypes="#//IntOperation"/> | 140 | <eClassifiers xsi:type="ecore:EClass" name="Minus" eSuperTypes="#//NumericOperation"/> |
| 141 | <eClassifiers xsi:type="ecore:EClass" name="Multiply" eSuperTypes="#//IntOperation"/> | 141 | <eClassifiers xsi:type="ecore:EClass" name="Multiply" eSuperTypes="#//NumericOperation"/> |
| 142 | <eClassifiers xsi:type="ecore:EClass" name="Divison" eSuperTypes="#//IntOperation"/> | 142 | <eClassifiers xsi:type="ecore:EClass" name="Divison" eSuperTypes="#//NumericOperation"/> |
| 143 | <eClassifiers xsi:type="ecore:EClass" name="Mod" eSuperTypes="#//IntOperation"/> | 143 | <eClassifiers xsi:type="ecore:EClass" name="Mod" eSuperTypes="#//NumericOperation"/> |
| 144 | <eClassifiers xsi:type="ecore:EClass" name="TypeDescriptor" abstract="true" interface="true"/> | 144 | <eClassifiers xsi:type="ecore:EClass" name="TypeDescriptor" abstract="true" interface="true"/> |
| 145 | <eClassifiers xsi:type="ecore:EClass" name="TermDescription" abstract="true" interface="true"/> | 145 | <eClassifiers xsi:type="ecore:EClass" name="TermDescription" abstract="true" interface="true"/> |
| 146 | <eClassifiers xsi:type="ecore:EClass" name="Assertion"> | 146 | <eClassifiers xsi:type="ecore:EClass" name="Assertion"> |
| @@ -211,4 +211,18 @@ | |||
| 211 | containment="true"/> | 211 | containment="true"/> |
| 212 | <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/> | 212 | <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/> |
| 213 | </eClassifiers> | 213 | </eClassifiers> |
| 214 | <eClassifiers xsi:type="ecore:EClass" name="Pow" eSuperTypes="#//NumericOperation"/> | ||
| 215 | <eClassifiers xsi:type="ecore:EClass" name="AggregateExpression" abstract="true" | ||
| 216 | eSuperTypes="#//Term"> | ||
| 217 | <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/> | ||
| 218 | </eClassifiers> | ||
| 219 | <eClassifiers xsi:type="ecore:EClass" name="Sum" eSuperTypes="#//ProjectedAggregateExpression"/> | ||
| 220 | <eClassifiers xsi:type="ecore:EClass" name="Count" eSuperTypes="#//AggregateExpression"/> | ||
| 221 | <eClassifiers xsi:type="ecore:EClass" name="Min" eSuperTypes="#//ProjectedAggregateExpression"/> | ||
| 222 | <eClassifiers xsi:type="ecore:EClass" name="Max" eSuperTypes="#//ProjectedAggregateExpression"/> | ||
| 223 | <eClassifiers xsi:type="ecore:EClass" name="ProjectedAggregateExpression" abstract="true" | ||
| 224 | eSuperTypes="#//AggregateExpression"> | ||
| 225 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="projectionIndex" lowerBound="1" | ||
| 226 | eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="-1"/> | ||
| 227 | </eClassifiers> | ||
| 214 | </ecore:EPackage> | 228 | </ecore:EPackage> |