6 files changed, 145 insertions, 65 deletions

diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftFactoryImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftFactoryImpl.java
index 33778461..6eac2861 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftFactoryImpl.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftFactoryImpl.java
@@ -58,7 +58,7 @@ public class CftFactoryImpl extends EFactoryImpl implements CftFactory {
                 switch (eClass.getClassifierID()) {
                         case CftPackage.COMPONENT_DEFINITION: return createComponentDefinition();
                         case CftPackage.BASIC_EVENT_DEFINITION: return createBasicEventDefinition();
-                        case CftPackage.INTPUT_EVENT: return createIntputEvent();
+                        case CftPackage.INPUT_EVENT: return createInputEvent();
                         case CftPackage.AND_GATE_DEFINITION: return createAndGateDefinition();
                         case CftPackage.OR_GATE_DEFINITION: return createOrGateDefinition();
                         case CftPackage.KOF_MGATE_DEFINITION: return createKOfMGateDefinition();
@@ -100,9 +100,9 @@ public class CftFactoryImpl extends EFactoryImpl implements CftFactory {
          * @generated
          */
         @Override
-        public IntputEvent createIntputEvent() {
-                IntputEventImpl intputEvent = new IntputEventImpl();
-                return intputEvent;
+        public InputEvent createInputEvent() {
+                InputEventImpl inputEvent = new InputEventImpl();
+                return inputEvent;
         }
 
         /**
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftPackageImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftPackageImpl.java
index f03fa0ba..1d6b6a23 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftPackageImpl.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftPackageImpl.java
@@ -14,7 +14,7 @@ import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.GateDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input;
-import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.IntputEvent;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.InputEvent;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.OrGateDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output;
@@ -68,7 +68,7 @@ public class CftPackageImpl extends EPackageImpl implements CftPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        private EClass intputEventEClass = null;
+        private EClass inputEventEClass = null;
 
         /**
          * <!-- begin-user-doc -->
@@ -303,8 +303,8 @@ public class CftPackageImpl extends EPackageImpl implements CftPackage {
          * @generated
          */
         @Override
-        public EClass getIntputEvent() {
-                return intputEventEClass;
+        public EClass getInputEvent() {
+                return inputEventEClass;
         }
 
         /**
@@ -313,8 +313,8 @@ public class CftPackageImpl extends EPackageImpl implements CftPackage {
          * @generated
          */
         @Override
-        public EAttribute getIntputEvent_Multiple() {
-                return (EAttribute)intputEventEClass.getEStructuralFeatures().get(0);
+        public EAttribute getInputEvent_Multiple() {
+                return (EAttribute)inputEventEClass.getEStructuralFeatures().get(0);
         }
 
         /**
@@ -463,6 +463,16 @@ public class CftPackageImpl extends EPackageImpl implements CftPackage {
          * @generated
          */
         @Override
+        public EAttribute getComponent_Name() {
+                return (EAttribute)componentEClass.getEStructuralFeatures().get(3);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
         public EClass getInput() {
                 return inputEClass;
         }
@@ -473,7 +483,7 @@ public class CftPackageImpl extends EPackageImpl implements CftPackage {
          * @generated
          */
         @Override
-        public EReference getInput_IntputEvent() {
+        public EReference getInput_InputEvent() {
                 return (EReference)inputEClass.getEStructuralFeatures().get(0);
         }
 
@@ -610,8 +620,8 @@ public class CftPackageImpl extends EPackageImpl implements CftPackage {
                 basicEventDefinitionEClass = createEClass(BASIC_EVENT_DEFINITION);
                 createEReference(basicEventDefinitionEClass, BASIC_EVENT_DEFINITION__DISTRIBUTION);
 
-                intputEventEClass = createEClass(INTPUT_EVENT);
-                createEAttribute(intputEventEClass, INTPUT_EVENT__MULTIPLE);
+                inputEventEClass = createEClass(INPUT_EVENT);
+                createEAttribute(inputEventEClass, INPUT_EVENT__MULTIPLE);
 
                 eventDeclarationEClass = createEClass(EVENT_DECLARATION);
                 createEAttribute(eventDeclarationEClass, EVENT_DECLARATION__NAME);
@@ -632,9 +642,10 @@ public class CftPackageImpl extends EPackageImpl implements CftPackage {
                 createEReference(componentEClass, COMPONENT__INPUTS);
                 createEReference(componentEClass, COMPONENT__OUTPUTS);
                 createEReference(componentEClass, COMPONENT__COMPONENT_DEFINITION);
+                createEAttribute(componentEClass, COMPONENT__NAME);
 
                 inputEClass = createEClass(INPUT);
-                createEReference(inputEClass, INPUT__INTPUT_EVENT);
+                createEReference(inputEClass, INPUT__INPUT_EVENT);
                 createEReference(inputEClass, INPUT__COMPONENT);
                 createEReference(inputEClass, INPUT__INCOMING_CONNECTIONS);
 
@@ -682,14 +693,14 @@ public class CftPackageImpl extends EPackageImpl implements CftPackage {
                 eventDefinitionEClass.getESuperTypes().add(this.getEventDeclaration());
                 gateDefinitionEClass.getESuperTypes().add(this.getEventDefinition());
                 basicEventDefinitionEClass.getESuperTypes().add(this.getEventDefinition());
-                intputEventEClass.getESuperTypes().add(this.getEventDeclaration());
+                inputEventEClass.getESuperTypes().add(this.getEventDeclaration());
                 andGateDefinitionEClass.getESuperTypes().add(this.getGateDefinition());
                 orGateDefinitionEClass.getESuperTypes().add(this.getGateDefinition());
                 kOfMGateDefinitionEClass.getESuperTypes().add(this.getGateDefinition());
 
                 // Initialize classes, features, and operations; add parameters
                 initEClass(componentDefinitionEClass, ComponentDefinition.class, "ComponentDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-                initEReference(getComponentDefinition_InputEvents(), this.getIntputEvent(), null, "inputEvents", null, 0, -1, ComponentDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getComponentDefinition_InputEvents(), this.getInputEvent(), null, "inputEvents", null, 0, -1, ComponentDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEReference(getComponentDefinition_EventDefinitions(), this.getEventDefinition(), null, "eventDefinitions", null, 0, -1, ComponentDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEReference(getComponentDefinition_OutputEvents(), this.getEventDeclaration(), null, "outputEvents", null, 0, -1, ComponentDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEAttribute(getComponentDefinition_Name(), ecorePackage.getEString(), "name", null, 0, 1, ComponentDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -702,8 +713,8 @@ public class CftPackageImpl extends EPackageImpl implements CftPackage {
                 initEClass(basicEventDefinitionEClass, BasicEventDefinition.class, "BasicEventDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
                 initEReference(getBasicEventDefinition_Distribution(), theFtPackage.getDistribution(), null, "distribution", null, 1, 1, BasicEventDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-                initEClass(intputEventEClass, IntputEvent.class, "IntputEvent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-                initEAttribute(getIntputEvent_Multiple(), ecorePackage.getEBoolean(), "multiple", null, 0, 1, IntputEvent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(inputEventEClass, InputEvent.class, "InputEvent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getInputEvent_Multiple(), ecorePackage.getEBoolean(), "multiple", null, 0, 1, InputEvent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
                 initEClass(eventDeclarationEClass, EventDeclaration.class, "EventDeclaration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
                 initEAttribute(getEventDeclaration_Name(), ecorePackage.getEString(), "name", null, 0, 1, EventDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -724,9 +735,10 @@ public class CftPackageImpl extends EPackageImpl implements CftPackage {
                 initEReference(getComponent_Inputs(), this.getInput(), this.getInput_Component(), "inputs", null, 0, -1, Component.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEReference(getComponent_Outputs(), this.getOutput(), this.getOutput_Component(), "outputs", null, 0, -1, Component.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEReference(getComponent_ComponentDefinition(), this.getComponentDefinition(), null, "componentDefinition", null, 1, 1, Component.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getComponent_Name(), ecorePackage.getEString(), "name", null, 0, 1, Component.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
                 initEClass(inputEClass, Input.class, "Input", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-                initEReference(getInput_IntputEvent(), this.getIntputEvent(), null, "intputEvent", null, 1, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getInput_InputEvent(), this.getInputEvent(), null, "inputEvent", null, 1, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEReference(getInput_Component(), this.getComponent(), this.getComponent_Inputs(), "component", null, 1, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEReference(getInput_IncomingConnections(), this.getConnection(), this.getConnection_Input(), "incomingConnections", null, 0, -1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentDefinitionImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentDefinitionImpl.java
index 58a476f3..3b79fb0c 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentDefinitionImpl.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentDefinitionImpl.java
@@ -6,8 +6,7 @@ import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDefinition;
-import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.IntputEvent;
-
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.InputEvent;
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
@@ -50,7 +49,7 @@ public class ComponentDefinitionImpl extends MinimalEObjectImpl.Container implem
          * @generated
          * @ordered
          */
-        protected EList<IntputEvent> inputEvents;
+        protected EList<InputEvent> inputEvents;
 
         /**
          * The cached value of the '{@link #getEventDefinitions() <em>Event Definitions</em>}' containment reference list.
@@ -117,9 +116,9 @@ public class ComponentDefinitionImpl extends MinimalEObjectImpl.Container implem
          * @generated
          */
         @Override
-        public EList<IntputEvent> getInputEvents() {
+        public EList<InputEvent> getInputEvents() {
                 if (inputEvents == null) {
-                        inputEvents = new EObjectContainmentEList<IntputEvent>(IntputEvent.class, this, CftPackage.COMPONENT_DEFINITION__INPUT_EVENTS);
+                        inputEvents = new EObjectContainmentEList<InputEvent>(InputEvent.class, this, CftPackage.COMPONENT_DEFINITION__INPUT_EVENTS);
                 }
                 return inputEvents;
         }
@@ -220,7 +219,7 @@ public class ComponentDefinitionImpl extends MinimalEObjectImpl.Container implem
                 switch (featureID) {
                         case CftPackage.COMPONENT_DEFINITION__INPUT_EVENTS:
                                 getInputEvents().clear();
-                                getInputEvents().addAll((Collection<? extends IntputEvent>)newValue);
+                                getInputEvents().addAll((Collection<? extends InputEvent>)newValue);
                                 return;
                         case CftPackage.COMPONENT_DEFINITION__EVENT_DEFINITIONS:
                                 getEventDefinitions().clear();
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentImpl.java
index 6d23dc78..847b6ee1 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentImpl.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentImpl.java
@@ -35,6 +35,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentImpl#getInputs <em>Inputs</em>}</li>
  *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentImpl#getOutputs <em>Outputs</em>}</li>
  *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentImpl#getComponentDefinition <em>Component Definition</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentImpl#getName <em>Name</em>}</li>
  * </ul>
  *
  * @generated
@@ -71,6 +72,26 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo
         protected ComponentDefinition componentDefinition;
 
         /**
+         * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getName()
+         * @generated
+         * @ordered
+         */
+        protected static final String NAME_EDEFAULT = null;
+
+        /**
+         * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getName()
+         * @generated
+         * @ordered
+         */
+        protected String name = NAME_EDEFAULT;
+
+        /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -160,6 +181,29 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo
          * <!-- end-user-doc -->
          * @generated
          */
+        @Override
+        public String getName() {
+                return name;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setName(String newName) {
+                String oldName = name;
+                name = newName;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.COMPONENT__NAME, oldName, name));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         @SuppressWarnings("unchecked")
         @Override
         public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
@@ -203,6 +247,8 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo
                         case CftPackage.COMPONENT__COMPONENT_DEFINITION:
                                 if (resolve) return getComponentDefinition();
                                 return basicGetComponentDefinition();
+                        case CftPackage.COMPONENT__NAME:
+                                return getName();
                 }
                 return super.eGet(featureID, resolve, coreType);
         }
@@ -227,6 +273,9 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo
                         case CftPackage.COMPONENT__COMPONENT_DEFINITION:
                                 setComponentDefinition((ComponentDefinition)newValue);
                                 return;
+                        case CftPackage.COMPONENT__NAME:
+                                setName((String)newValue);
+                                return;
                 }
                 super.eSet(featureID, newValue);
         }
@@ -248,6 +297,9 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo
                         case CftPackage.COMPONENT__COMPONENT_DEFINITION:
                                 setComponentDefinition((ComponentDefinition)null);
                                 return;
+                        case CftPackage.COMPONENT__NAME:
+                                setName(NAME_EDEFAULT);
+                                return;
                 }
                 super.eUnset(featureID);
         }
@@ -266,8 +318,26 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo
                                 return outputs != null && !outputs.isEmpty();
                         case CftPackage.COMPONENT__COMPONENT_DEFINITION:
                                 return componentDefinition != null;
+                        case CftPackage.COMPONENT__NAME:
+                                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
                 }
                 return super.eIsSet(featureID);
         }
 
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy()) return super.toString();
+
+                StringBuilder result = new StringBuilder(super.toString());
+                result.append(" (name: ");
+                result.append(name);
+                result.append(')');
+                return result.toString();
+        }
+
 } //ComponentImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/IntputEventImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/InputEventImpl.java
index ea22452f..8432e29b 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/IntputEventImpl.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/InputEventImpl.java
@@ -3,7 +3,7 @@
 package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl;
 
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
-import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.IntputEvent;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.InputEvent;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -13,18 +13,18 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Intput Event</b></em>'.
+ * An implementation of the model object '<em><b>Input Event</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.IntputEventImpl#isMultiple <em>Multiple</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.InputEventImpl#isMultiple <em>Multiple</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class IntputEventImpl extends EventDeclarationImpl implements IntputEvent {
+public class InputEventImpl extends EventDeclarationImpl implements InputEvent {
         /**
          * The default value of the '{@link #isMultiple() <em>Multiple</em>}' attribute.
          * <!-- begin-user-doc -->
@@ -50,7 +50,7 @@ public class IntputEventImpl extends EventDeclarationImpl implements IntputEvent
          * <!-- end-user-doc -->
          * @generated
          */
-        protected IntputEventImpl() {
+        protected InputEventImpl() {
                 super();
         }
 
@@ -61,7 +61,7 @@ public class IntputEventImpl extends EventDeclarationImpl implements IntputEvent
          */
         @Override
         protected EClass eStaticClass() {
-                return CftPackage.Literals.INTPUT_EVENT;
+                return CftPackage.Literals.INPUT_EVENT;
         }
 
         /**
@@ -84,7 +84,7 @@ public class IntputEventImpl extends EventDeclarationImpl implements IntputEvent
                 boolean oldMultiple = multiple;
                 multiple = newMultiple;
                 if (eNotificationRequired())
-                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.INTPUT_EVENT__MULTIPLE, oldMultiple, multiple));
+                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.INPUT_EVENT__MULTIPLE, oldMultiple, multiple));
         }
 
         /**
@@ -95,7 +95,7 @@ public class IntputEventImpl extends EventDeclarationImpl implements IntputEvent
         @Override
         public Object eGet(int featureID, boolean resolve, boolean coreType) {
                 switch (featureID) {
-                        case CftPackage.INTPUT_EVENT__MULTIPLE:
+                        case CftPackage.INPUT_EVENT__MULTIPLE:
                                 return isMultiple();
                 }
                 return super.eGet(featureID, resolve, coreType);
@@ -109,7 +109,7 @@ public class IntputEventImpl extends EventDeclarationImpl implements IntputEvent
         @Override
         public void eSet(int featureID, Object newValue) {
                 switch (featureID) {
-                        case CftPackage.INTPUT_EVENT__MULTIPLE:
+                        case CftPackage.INPUT_EVENT__MULTIPLE:
                                 setMultiple((Boolean)newValue);
                                 return;
                 }
@@ -124,7 +124,7 @@ public class IntputEventImpl extends EventDeclarationImpl implements IntputEvent
         @Override
         public void eUnset(int featureID) {
                 switch (featureID) {
-                        case CftPackage.INTPUT_EVENT__MULTIPLE:
+                        case CftPackage.INPUT_EVENT__MULTIPLE:
                                 setMultiple(MULTIPLE_EDEFAULT);
                                 return;
                 }
@@ -139,7 +139,7 @@ public class IntputEventImpl extends EventDeclarationImpl implements IntputEvent
         @Override
         public boolean eIsSet(int featureID) {
                 switch (featureID) {
-                        case CftPackage.INTPUT_EVENT__MULTIPLE:
+                        case CftPackage.INPUT_EVENT__MULTIPLE:
                                 return multiple != MULTIPLE_EDEFAULT;
                 }
                 return super.eIsSet(featureID);
@@ -161,4 +161,4 @@ public class IntputEventImpl extends EventDeclarationImpl implements IntputEvent
                 return result.toString();
         }
 
-} //IntputEventImpl
+} //InputEventImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/InputImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/InputImpl.java
index eda5fea0..aa560064 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/InputImpl.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/InputImpl.java
@@ -6,8 +6,7 @@ import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input;
-import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.IntputEvent;
-
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.InputEvent;
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
@@ -33,7 +32,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.InputImpl#getIntputEvent <em>Intput Event</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.InputImpl#getInputEvent <em>Input Event</em>}</li>
  *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.InputImpl#getComponent <em>Component</em>}</li>
  *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.InputImpl#getIncomingConnections <em>Incoming Connections</em>}</li>
  * </ul>
@@ -42,14 +41,14 @@ import org.eclipse.emf.ecore.util.InternalEList;
  */
 public class InputImpl extends MinimalEObjectImpl.Container implements Input {
         /**
-         * The cached value of the '{@link #getIntputEvent() <em>Intput Event</em>}' reference.
+         * The cached value of the '{@link #getInputEvent() <em>Input Event</em>}' reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see #getIntputEvent()
+         * @see #getInputEvent()
          * @generated
          * @ordered
          */
-        protected IntputEvent intputEvent;
+        protected InputEvent inputEvent;
 
         /**
          * The cached value of the '{@link #getIncomingConnections() <em>Incoming Connections</em>}' containment reference list.
@@ -86,16 +85,16 @@ public class InputImpl extends MinimalEObjectImpl.Container implements Input {
          * @generated
          */
         @Override
-        public IntputEvent getIntputEvent() {
-                if (intputEvent != null && intputEvent.eIsProxy()) {
-                        InternalEObject oldIntputEvent = (InternalEObject)intputEvent;
-                        intputEvent = (IntputEvent)eResolveProxy(oldIntputEvent);
-                        if (intputEvent != oldIntputEvent) {
+        public InputEvent getInputEvent() {
+                if (inputEvent != null && inputEvent.eIsProxy()) {
+                        InternalEObject oldInputEvent = (InternalEObject)inputEvent;
+                        inputEvent = (InputEvent)eResolveProxy(oldInputEvent);
+                        if (inputEvent != oldInputEvent) {
                                 if (eNotificationRequired())
-                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, CftPackage.INPUT__INTPUT_EVENT, oldIntputEvent, intputEvent));
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, CftPackage.INPUT__INPUT_EVENT, oldInputEvent, inputEvent));
                         }
                 }
-                return intputEvent;
+                return inputEvent;
         }
 
         /**
@@ -103,8 +102,8 @@ public class InputImpl extends MinimalEObjectImpl.Container implements Input {
          * <!-- end-user-doc -->
          * @generated
          */
-        public IntputEvent basicGetIntputEvent() {
-                return intputEvent;
+        public InputEvent basicGetInputEvent() {
+                return inputEvent;
         }
 
         /**
@@ -113,11 +112,11 @@ public class InputImpl extends MinimalEObjectImpl.Container implements Input {
          * @generated
          */
         @Override
-        public void setIntputEvent(IntputEvent newIntputEvent) {
-                IntputEvent oldIntputEvent = intputEvent;
-                intputEvent = newIntputEvent;
+        public void setInputEvent(InputEvent newInputEvent) {
+                InputEvent oldInputEvent = inputEvent;
+                inputEvent = newInputEvent;
                 if (eNotificationRequired())
-                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.INPUT__INTPUT_EVENT, oldIntputEvent, intputEvent));
+                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.INPUT__INPUT_EVENT, oldInputEvent, inputEvent));
         }
 
         /**
@@ -233,9 +232,9 @@ public class InputImpl extends MinimalEObjectImpl.Container implements Input {
         @Override
         public Object eGet(int featureID, boolean resolve, boolean coreType) {
                 switch (featureID) {
-                        case CftPackage.INPUT__INTPUT_EVENT:
-                                if (resolve) return getIntputEvent();
-                                return basicGetIntputEvent();
+                        case CftPackage.INPUT__INPUT_EVENT:
+                                if (resolve) return getInputEvent();
+                                return basicGetInputEvent();
                         case CftPackage.INPUT__COMPONENT:
                                 return getComponent();
                         case CftPackage.INPUT__INCOMING_CONNECTIONS:
@@ -253,8 +252,8 @@ public class InputImpl extends MinimalEObjectImpl.Container implements Input {
         @Override
         public void eSet(int featureID, Object newValue) {
                 switch (featureID) {
-                        case CftPackage.INPUT__INTPUT_EVENT:
-                                setIntputEvent((IntputEvent)newValue);
+                        case CftPackage.INPUT__INPUT_EVENT:
+                                setInputEvent((InputEvent)newValue);
                                 return;
                         case CftPackage.INPUT__COMPONENT:
                                 setComponent((Component)newValue);
@@ -275,8 +274,8 @@ public class InputImpl extends MinimalEObjectImpl.Container implements Input {
         @Override
         public void eUnset(int featureID) {
                 switch (featureID) {
-                        case CftPackage.INPUT__INTPUT_EVENT:
-                                setIntputEvent((IntputEvent)null);
+                        case CftPackage.INPUT__INPUT_EVENT:
+                                setInputEvent((InputEvent)null);
                                 return;
                         case CftPackage.INPUT__COMPONENT:
                                 setComponent((Component)null);
@@ -296,8 +295,8 @@ public class InputImpl extends MinimalEObjectImpl.Container implements Input {
         @Override
         public boolean eIsSet(int featureID) {
                 switch (featureID) {
-                        case CftPackage.INPUT__INTPUT_EVENT:
-                                return intputEvent != null;
+                        case CftPackage.INPUT__INPUT_EVENT:
+                                return inputEvent != null;
                         case CftPackage.INPUT__COMPONENT:
                                 return getComponent() != null;
                         case CftPackage.INPUT__INCOMING_CONNECTIONS: