2 files changed, 5 insertions, 50 deletions
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.ecore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.ecore
index a86e503e..ecfaa84b 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.ecore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.ecore
@@ -7,38 +7,14 @@
    <eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1"
        eType="#//ImportDeclaration" containment="true"/>
    <eStructuralFeatures xsi:type="ecore:EReference" name="componentDefinitions" upperBound="-1"
-        eType="#//ComponentDefinition" containment="true"/>
+        eType="ecore:EClass platform:/resource/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore#//ComponentDefinition"
+        containment="true"/>
    <eStructuralFeatures xsi:type="ecore:EReference" name="transformationDefinitions"
        upperBound="-1" eType="#//TransformationDefinition" containment="true"/>
  </eClassifiers>
  <eClassifiers xsi:type="ecore:EClass" name="ImportDeclaration">
    <eStructuralFeatures xsi:type="ecore:EAttribute" name="importedNamespace" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ComponentDefinition">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="inputEvents" upperBound="-1"
-        eType="#//InputEvent" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outputEvents" unique="false"
-        upperBound="-1" eType="#//EventDeclaration"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eventDefinitions" upperBound="-1"
-        eType="#//EventDefinition" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EventDeclaration">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="InputEvent" eSuperTypes="#//EventDeclaration">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiple" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EventDefinition" eSuperTypes="#//EventDeclaration"/>
-  <eClassifiers xsi:type="ecore:EClass" name="BasicEventDefinition" eSuperTypes="#//EventDefinition">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rate" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GateDefinition" eSuperTypes="#//EventDefinition">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="inputEvents" unique="false"
-        upperBound="-1" eType="#//EventDeclaration"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AndGate" eSuperTypes="#//GateDefinition"/>
-  <eClassifiers xsi:type="ecore:EClass" name="OrGate" eSuperTypes="#//GateDefinition"/>
  <eClassifiers xsi:type="ecore:EClass" name="TransformationDefinition">
    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
    <eStructuralFeatures xsi:type="ecore:EReference" name="mappingDefinitions" upperBound="-1"
@@ -76,9 +52,9 @@
  </eClassifiers>
  <eClassifiers xsi:type="ecore:EClass" name="EventReference">
    <eStructuralFeatures xsi:type="ecore:EReference" name="component" eType="#//Variable"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="event" eType="#//EventDeclaration"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="event" eType="ecore:EClass platform:/resource/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore#//EventDeclaration"/>
  </eClassifiers>
  <eClassifiers xsi:type="ecore:EClass" name="ComponentInstance" eSuperTypes="#//Variable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="componentType" eType="#//ComponentDefinition"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="componentType" eType="ecore:EClass platform:/resource/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore#//ComponentDefinition"/>
  </eClassifiers>
 </ecore:EPackage>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.genmodel b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.genmodel
index c2208adc..1b857035 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.genmodel
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.genmodel
@@ -3,7 +3,7 @@
    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.16.0" modelDirectory="/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen"
    modelPluginID="hu.bme.mit.inf.dslreasoner.faulttree.components" forceOverwrite="true"
    modelName="CftLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.16" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.viatra.query.patternlanguage.emf/model/PatternLanguage.genmodel#//vql">
+    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.16" usedGenPackages="platform:/resource/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.genmodel#//cft platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.viatra.query.patternlanguage.emf/model/PatternLanguage.genmodel#//vql">
  <genPackages prefix="CftLanguage" basePackage="hu.bme.mit.inf.dslreasoner.faulttree.components"
      disposableProviderFactory="true" fileExtensions="cft" ecorePackage="CftLanguage.ecore#/">
    <genClasses ecoreClass="CftLanguage.ecore#//CftModel">
@@ -15,27 +15,6 @@
    <genClasses ecoreClass="CftLanguage.ecore#//ImportDeclaration">
      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CftLanguage.ecore#//ImportDeclaration/importedNamespace"/>
    </genClasses>
-    <genClasses ecoreClass="CftLanguage.ecore#//ComponentDefinition">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CftLanguage.ecore#//ComponentDefinition/name"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CftLanguage.ecore#//ComponentDefinition/inputEvents"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference CftLanguage.ecore#//ComponentDefinition/outputEvents"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CftLanguage.ecore#//ComponentDefinition/eventDefinitions"/>
-    </genClasses>
-    <genClasses ecoreClass="CftLanguage.ecore#//EventDeclaration">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CftLanguage.ecore#//EventDeclaration/name"/>
-    </genClasses>
-    <genClasses ecoreClass="CftLanguage.ecore#//InputEvent">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CftLanguage.ecore#//InputEvent/multiple"/>
-    </genClasses>
-    <genClasses ecoreClass="CftLanguage.ecore#//EventDefinition"/>
-    <genClasses ecoreClass="CftLanguage.ecore#//BasicEventDefinition">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CftLanguage.ecore#//BasicEventDefinition/rate"/>
-    </genClasses>
-    <genClasses ecoreClass="CftLanguage.ecore#//GateDefinition">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference CftLanguage.ecore#//GateDefinition/inputEvents"/>
-    </genClasses>
-    <genClasses ecoreClass="CftLanguage.ecore#//AndGate"/>
-    <genClasses ecoreClass="CftLanguage.ecore#//OrGate"/>
    <genClasses ecoreClass="CftLanguage.ecore#//TransformationDefinition">
      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CftLanguage.ecore#//TransformationDefinition/name"/>
      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CftLanguage.ecore#//TransformationDefinition/mappingDefinitions"/>

diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.ecore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.ecore index a86e503e..ecfaa84b 100644 --- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.ecore +++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.ecore
@@ -7,38 +7,14 @@
7	<eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1"	7	<eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1"
8	eType="#//ImportDeclaration" containment="true"/>	8	eType="#//ImportDeclaration" containment="true"/>
9	<eStructuralFeatures xsi:type="ecore:EReference" name="componentDefinitions" upperBound="-1"	9	<eStructuralFeatures xsi:type="ecore:EReference" name="componentDefinitions" upperBound="-1"
10	eType="#//ComponentDefinition" containment="true"/>	10	eType="ecore:EClass platform:/resource/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore#//ComponentDefinition"
		11	containment="true"/>
11	<eStructuralFeatures xsi:type="ecore:EReference" name="transformationDefinitions"	12	<eStructuralFeatures xsi:type="ecore:EReference" name="transformationDefinitions"
12	upperBound="-1" eType="#//TransformationDefinition" containment="true"/>	13	upperBound="-1" eType="#//TransformationDefinition" containment="true"/>
13	</eClassifiers>	14	</eClassifiers>
14	<eClassifiers xsi:type="ecore:EClass" name="ImportDeclaration">	15	<eClassifiers xsi:type="ecore:EClass" name="ImportDeclaration">
15	<eStructuralFeatures xsi:type="ecore:EAttribute" name="importedNamespace" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>	16	<eStructuralFeatures xsi:type="ecore:EAttribute" name="importedNamespace" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
16	</eClassifiers>	17	</eClassifiers>
17	<eClassifiers xsi:type="ecore:EClass" name="ComponentDefinition">
18	<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
19	<eStructuralFeatures xsi:type="ecore:EReference" name="inputEvents" upperBound="-1"
20	eType="#//InputEvent" containment="true"/>
21	<eStructuralFeatures xsi:type="ecore:EReference" name="outputEvents" unique="false"
22	upperBound="-1" eType="#//EventDeclaration"/>
23	<eStructuralFeatures xsi:type="ecore:EReference" name="eventDefinitions" upperBound="-1"
24	eType="#//EventDefinition" containment="true"/>
25	</eClassifiers>
26	<eClassifiers xsi:type="ecore:EClass" name="EventDeclaration">
27	<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
28	</eClassifiers>
29	<eClassifiers xsi:type="ecore:EClass" name="InputEvent" eSuperTypes="#//EventDeclaration">
30	<eStructuralFeatures xsi:type="ecore:EAttribute" name="multiple" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
31	</eClassifiers>
32	<eClassifiers xsi:type="ecore:EClass" name="EventDefinition" eSuperTypes="#//EventDeclaration"/>
33	<eClassifiers xsi:type="ecore:EClass" name="BasicEventDefinition" eSuperTypes="#//EventDefinition">
34	<eStructuralFeatures xsi:type="ecore:EAttribute" name="rate" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"/>
35	</eClassifiers>
36	<eClassifiers xsi:type="ecore:EClass" name="GateDefinition" eSuperTypes="#//EventDefinition">
37	<eStructuralFeatures xsi:type="ecore:EReference" name="inputEvents" unique="false"
38	upperBound="-1" eType="#//EventDeclaration"/>
39	</eClassifiers>
40	<eClassifiers xsi:type="ecore:EClass" name="AndGate" eSuperTypes="#//GateDefinition"/>
41	<eClassifiers xsi:type="ecore:EClass" name="OrGate" eSuperTypes="#//GateDefinition"/>
42	<eClassifiers xsi:type="ecore:EClass" name="TransformationDefinition">	18	<eClassifiers xsi:type="ecore:EClass" name="TransformationDefinition">
43	<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>	19	<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
44	<eStructuralFeatures xsi:type="ecore:EReference" name="mappingDefinitions" upperBound="-1"	20	<eStructuralFeatures xsi:type="ecore:EReference" name="mappingDefinitions" upperBound="-1"
@@ -76,9 +52,9 @@
76	</eClassifiers>	52	</eClassifiers>
77	<eClassifiers xsi:type="ecore:EClass" name="EventReference">	53	<eClassifiers xsi:type="ecore:EClass" name="EventReference">
78	<eStructuralFeatures xsi:type="ecore:EReference" name="component" eType="#//Variable"/>	54	<eStructuralFeatures xsi:type="ecore:EReference" name="component" eType="#//Variable"/>
79	<eStructuralFeatures xsi:type="ecore:EReference" name="event" eType="#//EventDeclaration"/>	55	<eStructuralFeatures xsi:type="ecore:EReference" name="event" eType="ecore:EClass platform:/resource/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore#//EventDeclaration"/>
80	</eClassifiers>	56	</eClassifiers>
81	<eClassifiers xsi:type="ecore:EClass" name="ComponentInstance" eSuperTypes="#//Variable">	57	<eClassifiers xsi:type="ecore:EClass" name="ComponentInstance" eSuperTypes="#//Variable">
82	<eStructuralFeatures xsi:type="ecore:EReference" name="componentType" eType="#//ComponentDefinition"/>	58	<eStructuralFeatures xsi:type="ecore:EReference" name="componentType" eType="ecore:EClass platform:/resource/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore#//ComponentDefinition"/>
83	</eClassifiers>	59	</eClassifiers>
84	</ecore:EPackage>	60	</ecore:EPackage>


diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.genmodel b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.genmodel index c2208adc..1b857035 100644 --- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.genmodel +++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.genmodel
@@ -3,7 +3,7 @@
3	xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.16.0" modelDirectory="/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen"	3	xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.16.0" modelDirectory="/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen"
4	modelPluginID="hu.bme.mit.inf.dslreasoner.faulttree.components" forceOverwrite="true"	4	modelPluginID="hu.bme.mit.inf.dslreasoner.faulttree.components" forceOverwrite="true"
5	modelName="CftLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"	5	modelName="CftLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
6	complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.16" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.viatra.query.patternlanguage.emf/model/PatternLanguage.genmodel#//vql">	6	complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.16" usedGenPackages="platform:/resource/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.genmodel#//cft platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.viatra.query.patternlanguage.emf/model/PatternLanguage.genmodel#//vql">
7	<genPackages prefix="CftLanguage" basePackage="hu.bme.mit.inf.dslreasoner.faulttree.components"	7	<genPackages prefix="CftLanguage" basePackage="hu.bme.mit.inf.dslreasoner.faulttree.components"
8	disposableProviderFactory="true" fileExtensions="cft" ecorePackage="CftLanguage.ecore#/">	8	disposableProviderFactory="true" fileExtensions="cft" ecorePackage="CftLanguage.ecore#/">
9	<genClasses ecoreClass="CftLanguage.ecore#//CftModel">	9	<genClasses ecoreClass="CftLanguage.ecore#//CftModel">
@@ -15,27 +15,6 @@
15	<genClasses ecoreClass="CftLanguage.ecore#//ImportDeclaration">	15	<genClasses ecoreClass="CftLanguage.ecore#//ImportDeclaration">
16	<genFeatures createChild="false" ecoreFeature="ecore:EAttribute CftLanguage.ecore#//ImportDeclaration/importedNamespace"/>	16	<genFeatures createChild="false" ecoreFeature="ecore:EAttribute CftLanguage.ecore#//ImportDeclaration/importedNamespace"/>
17	</genClasses>	17	</genClasses>
18	<genClasses ecoreClass="CftLanguage.ecore#//ComponentDefinition">
19	<genFeatures createChild="false" ecoreFeature="ecore:EAttribute CftLanguage.ecore#//ComponentDefinition/name"/>
20	<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CftLanguage.ecore#//ComponentDefinition/inputEvents"/>
21	<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference CftLanguage.ecore#//ComponentDefinition/outputEvents"/>
22	<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CftLanguage.ecore#//ComponentDefinition/eventDefinitions"/>
23	</genClasses>
24	<genClasses ecoreClass="CftLanguage.ecore#//EventDeclaration">
25	<genFeatures createChild="false" ecoreFeature="ecore:EAttribute CftLanguage.ecore#//EventDeclaration/name"/>
26	</genClasses>
27	<genClasses ecoreClass="CftLanguage.ecore#//InputEvent">
28	<genFeatures createChild="false" ecoreFeature="ecore:EAttribute CftLanguage.ecore#//InputEvent/multiple"/>
29	</genClasses>
30	<genClasses ecoreClass="CftLanguage.ecore#//EventDefinition"/>
31	<genClasses ecoreClass="CftLanguage.ecore#//BasicEventDefinition">
32	<genFeatures createChild="false" ecoreFeature="ecore:EAttribute CftLanguage.ecore#//BasicEventDefinition/rate"/>
33	</genClasses>
34	<genClasses ecoreClass="CftLanguage.ecore#//GateDefinition">
35	<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference CftLanguage.ecore#//GateDefinition/inputEvents"/>
36	</genClasses>
37	<genClasses ecoreClass="CftLanguage.ecore#//AndGate"/>
38	<genClasses ecoreClass="CftLanguage.ecore#//OrGate"/>
39	<genClasses ecoreClass="CftLanguage.ecore#//TransformationDefinition">	18	<genClasses ecoreClass="CftLanguage.ecore#//TransformationDefinition">
40	<genFeatures createChild="false" ecoreFeature="ecore:EAttribute CftLanguage.ecore#//TransformationDefinition/name"/>	19	<genFeatures createChild="false" ecoreFeature="ecore:EAttribute CftLanguage.ecore#//TransformationDefinition/name"/>
41	<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CftLanguage.ecore#//TransformationDefinition/mappingDefinitions"/>	20	<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CftLanguage.ecore#//TransformationDefinition/mappingDefinitions"/>