Fault tree transformation for partial models WIP

2 files changed, 22 insertions, 2 deletions

diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore
index 2fc15d94..a843aeed 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore
@@ -38,7 +38,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="topEvent" lowerBound="1"
         eType="#//Output"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Component">
+  <eClassifiers xsi:type="ecore:EClass" name="Component" eSuperTypes="#//ModalElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="inputs" upperBound="-1"
         eType="#//Input" containment="true" eOpposite="#//Input/component"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="outputs" upperBound="-1"
@@ -46,6 +46,8 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="componentDefinition" lowerBound="1"
         eType="#//ComponentDefinition"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multipleAllowed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Input">
     <eStructuralFeatures xsi:type="ecore:EReference" name="inputEvent" lowerBound="1"
@@ -63,10 +65,19 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="component" lowerBound="1"
         eType="#//Component" eOpposite="#//Component/outputs"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Connection">
+  <eClassifiers xsi:type="ecore:EClass" name="Connection" eSuperTypes="#//ModalElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="input" lowerBound="1" eType="#//Input"
         eOpposite="#//Input/incomingConnections"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="output" lowerBound="1"
         eType="#//Output" eOpposite="#//Output/outgoingConnections"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Modality">
+    <eLiterals name="MAY"/>
+    <eLiterals name="CURRENT" value="1"/>
+    <eLiterals name="MUST" value="2"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ModalElement" abstract="true" interface="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="exists" eType="#//Modality"
+        defaultValueLiteral="MUST"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.genmodel b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.genmodel
index 635a2f46..3cdc93c4 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.genmodel
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.genmodel
@@ -7,6 +7,11 @@
   <foreignModel>cft.ecore</foreignModel>
   <genPackages prefix="Cft" basePackage="hu.bme.mit.inf.dslreasoner.faulttree.model"
       disposableProviderFactory="true" ecorePackage="cft.ecore#/">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="cft.ecore#//Modality">
+      <genEnumLiterals ecoreEnumLiteral="cft.ecore#//Modality/MAY"/>
+      <genEnumLiterals ecoreEnumLiteral="cft.ecore#//Modality/CURRENT"/>
+      <genEnumLiterals ecoreEnumLiteral="cft.ecore#//Modality/MUST"/>
+    </genEnums>
     <genClasses ecoreClass="cft.ecore#//ComponentDefinition">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cft.ecore#//ComponentDefinition/inputEvents"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cft.ecore#//ComponentDefinition/eventDefinitions"/>
@@ -41,6 +46,7 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cft.ecore#//Component/outputs"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cft.ecore#//Component/componentDefinition"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cft.ecore#//Component/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cft.ecore#//Component/multipleAllowed"/>
     </genClasses>
     <genClasses ecoreClass="cft.ecore#//Input">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cft.ecore#//Input/inputEvent"/>
@@ -56,5 +62,8 @@
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference cft.ecore#//Connection/input"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cft.ecore#//Connection/output"/>
     </genClasses>
+    <genClasses ecoreClass="cft.ecore#//ModalElement">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cft.ecore#//ModalElement/exists"/>
+    </genClasses>
   </genPackages>
 </genmodel:GenModel>