2 files changed, 22 insertions, 2 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.ecore b/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.ecore
index 5ffe633a..629d8670 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.ecore
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.ecore
@@ -114,14 +114,25 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="direction" eType="#//OptimizationDirection"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="ComparisonOperator">
-    <eLiterals name="LESS_EQUALS" literal="&lt;="/>
-    <eLiterals name="GREATER_EQUALS" value="1" literal=">="/>
+    <eLiterals name="LESS" literal="&lt;"/>
+    <eLiterals name="GREATER" value="1" literal=">"/>
+    <eLiterals name="LESS_EQUALS" value="2" literal="&lt;="/>
+    <eLiterals name="GREATER_EQUALS" value="3" literal=">="/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ThresholdEntry" eSuperTypes="#//ObjectiveEntry">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="operator" eType="#//ComparisonOperator"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="threshold" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EBigDecimal"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ObjectiveFunction"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CostObjectiveFunction" eSuperTypes="#//ObjectiveFunction">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="entries" upperBound="-1"
+        eType="#//CostEntry" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CostEntry">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="patternElement" eType="#//PatternElement"
+        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="weight" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>
+  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ReliabilityObjectiveFunction" eSuperTypes="#//ObjectiveFunction">
     <eStructuralFeatures xsi:type="ecore:EReference" name="package" eType="ecore:EClass platform:/resource/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.ecore#//CftModel"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="transformation" eType="ecore:EClass platform:/resource/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.ecore#//TransformationDefinition"/>
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.genmodel b/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.genmodel
index 1a1e7896..bc5df821 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.genmodel
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.genmodel
@@ -11,6 +11,8 @@
       <genEnumLiterals ecoreEnumLiteral="ApplicationConfiguration.ecore#//OptimizationDirection/MAXIMIZE"/>
     </genEnums>
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="ApplicationConfiguration.ecore#//ComparisonOperator">
+      <genEnumLiterals ecoreEnumLiteral="ApplicationConfiguration.ecore#//ComparisonOperator/LESS"/>
+      <genEnumLiterals ecoreEnumLiteral="ApplicationConfiguration.ecore#//ComparisonOperator/GREATER"/>
       <genEnumLiterals ecoreEnumLiteral="ApplicationConfiguration.ecore#//ComparisonOperator/LESS_EQUALS"/>
       <genEnumLiterals ecoreEnumLiteral="ApplicationConfiguration.ecore#//ComparisonOperator/GREATER_EQUALS"/>
     </genEnums>
@@ -122,6 +124,13 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//ThresholdEntry/threshold"/>
     </genClasses>
     <genClasses ecoreClass="ApplicationConfiguration.ecore#//ObjectiveFunction"/>
+    <genClasses ecoreClass="ApplicationConfiguration.ecore#//CostObjectiveFunction">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//CostObjectiveFunction/entries"/>
+    </genClasses>
+    <genClasses ecoreClass="ApplicationConfiguration.ecore#//CostEntry">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//CostEntry/patternElement"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//CostEntry/weight"/>
+    </genClasses>
     <genClasses ecoreClass="ApplicationConfiguration.ecore#//ReliabilityObjectiveFunction">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//ReliabilityObjectiveFunction/package"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//ReliabilityObjectiveFunction/transformation"/>