2 files changed, 26 insertions, 12 deletions

diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/ft.ecore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/ft.ecore
index f1f410a7..afe9395e 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/ft.ecore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/ft.ecore
@@ -2,22 +2,22 @@
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="ft" nsURI="http://www.bme.hu/mit/inf/dslreasoner/faulttree/model/ft"
     nsPrefix="ft">
-  <eClassifiers xsi:type="ecore:EClass" name="FaultTree">
+  <eClassifiers xsi:type="ecore:EClass" name="FaultTree" eSuperTypes="#//ReliabilityModel">
     <eStructuralFeatures xsi:type="ecore:EReference" name="events" upperBound="-1"
-        eType="#//Event" containment="true"/>
+        eType="#//RandomEvent" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="topEvent" lowerBound="1"
-        eType="#//Event"/>
+        eType="#//RandomEvent"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Event" abstract="true">
+  <eClassifiers xsi:type="ecore:EClass" name="RandomEvent" abstract="true" eSuperTypes="#//Event">
     <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="BasicEvent" eSuperTypes="#//Event">
+  <eClassifiers xsi:type="ecore:EClass" name="BasicEvent" eSuperTypes="#//RandomEvent">
     <eStructuralFeatures xsi:type="ecore:EReference" name="distribution" lowerBound="1"
         eType="#//Distribution" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Gate" abstract="true" eSuperTypes="#//Event">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="inputEvents" upperBound="-1"
-        eType="#//Event"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Gate" abstract="true" eSuperTypes="#//RandomEvent">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="inputEvents" lowerBound="2"
+        upperBound="-1" eType="#//RandomEvent"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Distribution" abstract="true"/>
   <eClassifiers xsi:type="ecore:EClass" name="ConstantDistribution" eSuperTypes="#//Distribution">
@@ -30,6 +30,13 @@
   <eClassifiers xsi:type="ecore:EClass" name="OrGate" eSuperTypes="#//Gate"/>
   <eClassifiers xsi:type="ecore:EClass" name="KOfMGate" eSuperTypes="#//Gate">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="k" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="m" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ReliabilityModel" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ConstantModel" eSuperTypes="#//ReliabilityModel">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="failed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Event" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ConstantEvent" eSuperTypes="#//Event">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="failed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
 </ecore:EPackage>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/ft.genmodel b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/ft.genmodel
index b5f63c34..7dcd0ae7 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/ft.genmodel
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/ft.genmodel
@@ -11,8 +11,8 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ft.ecore#//FaultTree/events"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ft.ecore#//FaultTree/topEvent"/>
     </genClasses>
-    <genClasses image="false" ecoreClass="ft.ecore#//Event">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ft.ecore#//Event/name"/>
+    <genClasses image="false" ecoreClass="ft.ecore#//RandomEvent">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ft.ecore#//RandomEvent/name"/>
     </genClasses>
     <genClasses ecoreClass="ft.ecore#//BasicEvent">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ft.ecore#//BasicEvent/distribution"/>
@@ -31,7 +31,14 @@
     <genClasses ecoreClass="ft.ecore#//OrGate"/>
     <genClasses ecoreClass="ft.ecore#//KOfMGate">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ft.ecore#//KOfMGate/k"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ft.ecore#//KOfMGate/m"/>
+    </genClasses>
+    <genClasses ecoreClass="ft.ecore#//ReliabilityModel"/>
+    <genClasses ecoreClass="ft.ecore#//ConstantModel">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ft.ecore#//ConstantModel/failed"/>
+    </genClasses>
+    <genClasses ecoreClass="ft.ecore#//Event"/>
+    <genClasses ecoreClass="ft.ecore#//ConstantEvent">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ft.ecore#//ConstantEvent/failed"/>
     </genClasses>
   </genPackages>
 </genmodel:GenModel>