2 files changed, 145 insertions, 59 deletions

diff --git a/Application/org.eclipse.viatra.solver.language/model/generated/SolverLanguage.ecore b/Application/org.eclipse.viatra.solver.language/model/SolverLanguage.ecore
index bd516038..905e5a90 100644
--- a/Application/org.eclipse.viatra.solver.language/model/generated/SolverLanguage.ecore
+++ b/Application/org.eclipse.viatra.solver.language/model/SolverLanguage.ecore
@@ -26,38 +26,63 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="range" eType="#//Expression"

         containment="true"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ExternPredicateDefinition" eSuperTypes="#//Statement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="head" eType="#//Call" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EEnum" name="MetricType">

-    <eLiterals name="INT" literal="int"/>

-    <eLiterals name="REAL" value="1" literal="real"/>

-  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="MetricDefinition" eSuperTypes="#//Statement">

     <eStructuralFeatures xsi:type="ecore:EReference" name="head" eType="#//Expression"

         containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="body" eType="#//Expression"

         containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//MetricType"/>

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

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ExternPredicateDefinition" eSuperTypes="#//Statement">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="argumentList" eType="#//ArgumentList"

+        containment="true"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="ExternMetricDefinition" eSuperTypes="#//Statement">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//MetricType"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="head" eType="#//Call" containment="true"/>

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="argumentList" eType="#//ArgumentList"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ExternAggregatorDefinition" eSuperTypes="#//Statement">

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

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="inputType" eType="#//NamedElement"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ExternDatatypeDefinition" eSuperTypes="#//Statement">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="supertypes" unique="false"

+        upperBound="-1" eType="#//NamedElement"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Expression" eSuperTypes="#//Statement"/>

+  <eClassifiers xsi:type="ecore:EClass" name="NamedElement">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Expression" abstract="true" eSuperTypes="#//Statement"/>

   <eClassifiers xsi:type="ecore:EClass" name="IfElse" eSuperTypes="#//Expression">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="condition" eType="#//Expression"

-        containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="then" eType="#//Expression"

         containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="else" eType="#//Expression"

         containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Case" eSuperTypes="#//Expression">

     <eStructuralFeatures xsi:type="ecore:EReference" name="condition" eType="#//Expression"

         containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Let" eSuperTypes="#//Expression">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="bindings" upperBound="-1"

+        eType="#//LetBinding" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="body" eType="#//Expression"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="LetBinding">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//NamedElement"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//Expression"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Case" eSuperTypes="#//Expression">

     <eStructuralFeatures xsi:type="ecore:EReference" name="body" eType="#//Expression"

         containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="condition" eType="#//Expression"

+        containment="true"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EEnum" name="BinaryOperator">

     <eLiterals name="EQ" literal="EQ"/>

@@ -72,6 +97,7 @@
     <eLiterals name="MUL" value="9" literal="MUL"/>

     <eLiterals name="DIV" value="10" literal="DIV"/>

     <eLiterals name="POW" value="11" literal="POW"/>

+    <eLiterals name="IMPLIES" value="12"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EEnum" name="UnaryOp">

     <eLiterals name="NEG" literal="!"/>

@@ -81,20 +107,21 @@
     <eLiterals name="MUST" value="4" literal="must"/>

     <eLiterals name="CURRENT" value="5" literal="current"/>

   </eClassifiers>

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

+  <eClassifiers xsi:type="ecore:EClass" name="LocalVariables">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="variables" upperBound="-1"

+        eType="#//NamedElement" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="QuantifiedExpression" eSuperTypes="#//Expression">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="localVariables" eType="#//LocalVariables"

+        containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="body" eType="#//Expression"

         containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EEnum" name="AggregationOp">

-    <eLiterals name="ONLY" literal="only"/>

-    <eLiterals name="SUM" value="1" literal="sum"/>

-    <eLiterals name="PROD" value="2" literal="prod"/>

-    <eLiterals name="AVG" value="3" literal="avg"/>

-    <eLiterals name="MIN" value="4" literal="min"/>

-    <eLiterals name="MAX" value="5" literal="max"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="quantifier" eType="#//Quantifier"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Aggregation" eSuperTypes="#//Expression">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="op" eType="#//AggregationOp"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="op" eType="#//NamedElement"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="localVariables" eType="#//LocalVariables"

+        containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="body" eType="#//Expression"

         containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="condition" eType="#//Expression"

@@ -200,15 +227,15 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="objective" eType="#//Expression"

         containment="true"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="NamedElement">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Assertion" eSuperTypes="#//Statement">

+  <eClassifiers xsi:type="ecore:EClass" name="Interpretation" eSuperTypes="#//Statement">

     <eStructuralFeatures xsi:type="ecore:EReference" name="body" eType="#//Expression"

         containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="range" eType="#//Expression"

         containment="true"/>

   </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Variable" eSuperTypes="#//NamedElement">

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

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Disjunction" eSuperTypes="#//Expression">

     <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"

         eType="#//Expression" containment="true"/>

@@ -235,9 +262,30 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="right" eType="#//Expression"

         containment="true"/>

   </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="CastExpression" eSuperTypes="#//Expression">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="body" eType="#//Expression"

+        containment="true"/>

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

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="UnaryExpression" eSuperTypes="#//Expression">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="op" eType="#//UnaryOp"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="body" eType="#//Expression"

         containment="true"/>

   </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Node" eSuperTypes="#//NamedElement">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="withId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Functor" abstract="true" eSuperTypes="#//NamedElement">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"

+        eType="#//Variable"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Predicate" eSuperTypes="#//Functor"/>

+  <eClassifiers xsi:type="ecore:EClass" name="Metric" eSuperTypes="#//Functor">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="returnType" eType="#//NamedElement"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="Quantifier">

+    <eLiterals name="EXISTS"/>

+    <eLiterals name="FORALL" value="1"/>

+    <eLiterals name="COUNT" value="2"/>

+  </eClassifiers>

 </ecore:EPackage>

diff --git a/Application/org.eclipse.viatra.solver.language/model/generated/SolverLanguage.genmodel b/Application/org.eclipse.viatra.solver.language/model/SolverLanguage.genmodel
index 53c17e2a..2325d668 100644
--- a/Application/org.eclipse.viatra.solver.language/model/generated/SolverLanguage.genmodel
+++ b/Application/org.eclipse.viatra.solver.language/model/SolverLanguage.genmodel
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.21.0" modelDirectory="/org.eclipse.viatra.solver.language/src-gen"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.21.0" modelDirectory="/org.eclipse.viatra.solver.language/ecore-gen"

     modelPluginID="org.eclipse.viatra.solver.language" forceOverwrite="true" modelName="SolverLanguage"

     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

-    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20">

+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"

+    runtimeVersion="2.20">

+  <foreignModel>SolverLanguage.ecore</foreignModel>

   <genPackages prefix="SolverLanguage" basePackage="org.eclipse.viatra.solver.language"

       disposableProviderFactory="true" fileExtensions="vsc" ecorePackage="SolverLanguage.ecore#/">

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="SolverLanguage.ecore#//MetricType">

-      <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//MetricType/INT"/>

-      <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//MetricType/REAL"/>

-    </genEnums>

     <genEnums typeSafeEnumCompatible="false" ecoreEnum="SolverLanguage.ecore#//BinaryOperator">

       <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//BinaryOperator/EQ"/>

       <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//BinaryOperator/NOT_EQ"/>

@@ -23,6 +21,7 @@
       <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//BinaryOperator/MUL"/>

       <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//BinaryOperator/DIV"/>

       <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//BinaryOperator/POW"/>

+      <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//BinaryOperator/IMPLIES"/>

     </genEnums>

     <genEnums typeSafeEnumCompatible="false" ecoreEnum="SolverLanguage.ecore#//UnaryOp">

       <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//UnaryOp/NEG"/>

@@ -32,14 +31,6 @@
       <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//UnaryOp/MUST"/>

       <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//UnaryOp/CURRENT"/>

     </genEnums>

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="SolverLanguage.ecore#//AggregationOp">

-      <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//AggregationOp/ONLY"/>

-      <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//AggregationOp/SUM"/>

-      <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//AggregationOp/PROD"/>

-      <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//AggregationOp/AVG"/>

-      <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//AggregationOp/MIN"/>

-      <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//AggregationOp/MAX"/>

-    </genEnums>

     <genEnums typeSafeEnumCompatible="false" ecoreEnum="SolverLanguage.ecore#//LogicValue">

       <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//LogicValue/TRUE"/>

       <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//LogicValue/FALSE"/>

@@ -50,6 +41,11 @@
       <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//ObjectiveKind/MINIMIZE"/>

       <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//ObjectiveKind/MAXIMIZE"/>

     </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="SolverLanguage.ecore#//Quantifier">

+      <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//Quantifier/EXISTS"/>

+      <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//Quantifier/FORALL"/>

+      <genEnumLiterals ecoreEnumLiteral="SolverLanguage.ecore#//Quantifier/COUNT"/>

+    </genEnums>

     <genClasses ecoreClass="SolverLanguage.ecore#//Problem">

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Problem/statements"/>

     </genClasses>

@@ -68,33 +64,61 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//DefaultDefinition/head"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//DefaultDefinition/range"/>

     </genClasses>

-    <genClasses ecoreClass="SolverLanguage.ecore#//ExternPredicateDefinition">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//ExternPredicateDefinition/head"/>

-    </genClasses>

     <genClasses ecoreClass="SolverLanguage.ecore#//MetricDefinition">

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//MetricDefinition/head"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//MetricDefinition/body"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//MetricDefinition/type"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//MetricDefinition/type"/>

+    </genClasses>

+    <genClasses ecoreClass="SolverLanguage.ecore#//ExternPredicateDefinition">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//ExternPredicateDefinition/name"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//ExternPredicateDefinition/argumentList"/>

     </genClasses>

     <genClasses ecoreClass="SolverLanguage.ecore#//ExternMetricDefinition">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//ExternMetricDefinition/type"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//ExternMetricDefinition/head"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//ExternMetricDefinition/type"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//ExternMetricDefinition/name"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//ExternMetricDefinition/argumentList"/>

+    </genClasses>

+    <genClasses ecoreClass="SolverLanguage.ecore#//ExternAggregatorDefinition">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//ExternAggregatorDefinition/type"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//ExternAggregatorDefinition/name"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//ExternAggregatorDefinition/inputType"/>

+    </genClasses>

+    <genClasses ecoreClass="SolverLanguage.ecore#//ExternDatatypeDefinition">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//ExternDatatypeDefinition/name"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//ExternDatatypeDefinition/supertypes"/>

+    </genClasses>

+    <genClasses ecoreClass="SolverLanguage.ecore#//NamedElement">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//NamedElement/name"/>

     </genClasses>

     <genClasses ecoreClass="SolverLanguage.ecore#//Expression"/>

     <genClasses ecoreClass="SolverLanguage.ecore#//IfElse">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//IfElse/condition"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//IfElse/then"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//IfElse/else"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//IfElse/condition"/>

+    </genClasses>

+    <genClasses ecoreClass="SolverLanguage.ecore#//Let">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Let/bindings"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Let/body"/>

+    </genClasses>

+    <genClasses ecoreClass="SolverLanguage.ecore#//LetBinding">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//LetBinding/variable"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//LetBinding/value"/>

     </genClasses>

     <genClasses ecoreClass="SolverLanguage.ecore#//Case">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Case/condition"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Case/body"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Case/condition"/>

+    </genClasses>

+    <genClasses ecoreClass="SolverLanguage.ecore#//LocalVariables">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//LocalVariables/variables"/>

     </genClasses>

-    <genClasses ecoreClass="SolverLanguage.ecore#//Count">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Count/body"/>

+    <genClasses ecoreClass="SolverLanguage.ecore#//QuantifiedExpression">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//QuantifiedExpression/localVariables"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//QuantifiedExpression/body"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//QuantifiedExpression/quantifier"/>

     </genClasses>

     <genClasses ecoreClass="SolverLanguage.ecore#//Aggregation">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//Aggregation/op"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Aggregation/op"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Aggregation/localVariables"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Aggregation/body"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Aggregation/condition"/>

     </genClasses>

@@ -177,12 +201,12 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//ObjectiveDefinition/kind"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//ObjectiveDefinition/objective"/>

     </genClasses>

-    <genClasses ecoreClass="SolverLanguage.ecore#//NamedElement">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//NamedElement/name"/>

+    <genClasses ecoreClass="SolverLanguage.ecore#//Interpretation">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Interpretation/body"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Interpretation/range"/>

     </genClasses>

-    <genClasses ecoreClass="SolverLanguage.ecore#//Assertion">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Assertion/body"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Assertion/range"/>

+    <genClasses ecoreClass="SolverLanguage.ecore#//Variable">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Variable/type"/>

     </genClasses>

     <genClasses ecoreClass="SolverLanguage.ecore#//Disjunction">

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Disjunction/children"/>

@@ -203,9 +227,23 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//BinaryExpression/op"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//BinaryExpression/right"/>

     </genClasses>

+    <genClasses ecoreClass="SolverLanguage.ecore#//CastExpression">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//CastExpression/body"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//CastExpression/type"/>

+    </genClasses>

     <genClasses ecoreClass="SolverLanguage.ecore#//UnaryExpression">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//UnaryExpression/op"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//UnaryExpression/body"/>

     </genClasses>

+    <genClasses ecoreClass="SolverLanguage.ecore#//Node">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//Node/withId"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="SolverLanguage.ecore#//Functor">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Functor/parameters"/>

+    </genClasses>

+    <genClasses ecoreClass="SolverLanguage.ecore#//Predicate"/>

+    <genClasses ecoreClass="SolverLanguage.ecore#//Metric">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Metric/returnType"/>

+    </genClasses>

   </genPackages>

 </genmodel:GenModel>