1 files changed, 64 insertions, 0 deletions
diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.ecore b/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.ecore
index 9654ba41..a8a3bf64 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.ecore
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.ecore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <?xml version="1.0" encoding="UTF-8"?>
 <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="functionalarchitecture" nsURI="http://www.inf.mit.bme.hu/viatrasolver/example/fam"
@@ -67,3 +68,66 @@
    <eLiterals name="Leaf" value="2"/>
  </eClassifiers>
 </ecore:EPackage>
+=======
+<?xml version="1.0" encoding="UTF-8"?>
+<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="functionalarchitecture" nsURI="http://www.inf.mit.bme.hu/viatrasolver/example/fam"
+    nsPrefix="functionalarchitecture">
+  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
+    <details key="settingDelegates" value="org.eclipse.viatra.query.querybasedfeature"/>
+  </eAnnotations>
+  <eClassifiers xsi:type="ecore:EClass" name="FunctionalElement" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="interface" eType="#//FunctionalInterface"
+        containment="true" eOpposite="#//FunctionalInterface/element"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="model" lowerBound="1" eType="#//FunctionalArchitectureModel"
+        volatile="true" transient="true" derived="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//Function"
+        eOpposite="#//Function/subElements"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FunctionalArchitectureModel">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="rootElements" upperBound="-1"
+        eType="#//FunctionalElement" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Function" eSuperTypes="#//FunctionalElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="subElements" upperBound="-1"
+        eType="#//FunctionalElement" containment="true" eOpposite="#//FunctionalElement/parent"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" lowerBound="1" eType="#//FunctionType"
+        changeable="false" volatile="true" transient="true" derived="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FAMTerminator">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="data" eType="#//FunctionalData"
+        eOpposite="#//FunctionalData/terminator"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="InformationLink">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="from" eType="#//FunctionalOutput"
+        eOpposite="#//FunctionalOutput/outgoingLinks"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="to" lowerBound="1" eType="#//FunctionalInput"
+        eOpposite="#//FunctionalInput/IncomingLinks"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FunctionalInterface">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="data" upperBound="-1" eType="#//FunctionalData"
+        containment="true" eOpposite="#//FunctionalData/interface"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="element" eType="#//FunctionalElement"
+        eOpposite="#//FunctionalElement/interface"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FunctionalInput" eSuperTypes="#//FunctionalData">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="IncomingLinks" upperBound="-1"
+        eType="#//InformationLink" eOpposite="#//InformationLink/to"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FunctionalOutput" eSuperTypes="#//FunctionalData">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="outgoingLinks" upperBound="-1"
+        eType="#//InformationLink" containment="true" eOpposite="#//InformationLink/from"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FunctionalData" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="terminator" eType="#//FAMTerminator"
+        containment="true" eOpposite="#//FAMTerminator/data"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="interface" eType="#//FunctionalInterface"
+        eOpposite="#//FunctionalInterface/data"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="FunctionType">
+    <eLiterals name="Root"/>
+    <eLiterals name="Intermediate" value="1"/>
+    <eLiterals name="Leaf" value="2"/>
+  </eClassifiers>
+</ecore:EPackage>
+>>>>>>> 71108d46... VAMPIRE: Implement wf constraint handling

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.ecore b/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.ecore index 9654ba41..a8a3bf64 100644 --- a/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.ecore +++ b/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.ecore
@@ -1,3 +1,4 @@
		1	<<<<<<< HEAD
1	<?xml version="1.0" encoding="UTF-8"?>	2	<?xml version="1.0" encoding="UTF-8"?>
2	<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"	3	<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3	xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="functionalarchitecture" nsURI="http://www.inf.mit.bme.hu/viatrasolver/example/fam"	4	xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="functionalarchitecture" nsURI="http://www.inf.mit.bme.hu/viatrasolver/example/fam"
@@ -67,3 +68,66 @@
67	<eLiterals name="Leaf" value="2"/>	68	<eLiterals name="Leaf" value="2"/>
68	</eClassifiers>	69	</eClassifiers>
69	</ecore:EPackage>	70	</ecore:EPackage>
		71	=======
		72	<?xml version="1.0" encoding="UTF-8"?>
		73	<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
		74	xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="functionalarchitecture" nsURI="http://www.inf.mit.bme.hu/viatrasolver/example/fam"
		75	nsPrefix="functionalarchitecture">
		76	<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
		77	<details key="settingDelegates" value="org.eclipse.viatra.query.querybasedfeature"/>
		78	</eAnnotations>
		79	<eClassifiers xsi:type="ecore:EClass" name="FunctionalElement" abstract="true">
		80	<eStructuralFeatures xsi:type="ecore:EReference" name="interface" eType="#//FunctionalInterface"
		81	containment="true" eOpposite="#//FunctionalInterface/element"/>
		82	<eStructuralFeatures xsi:type="ecore:EReference" name="model" lowerBound="1" eType="#//FunctionalArchitectureModel"
		83	volatile="true" transient="true" derived="true"/>
		84	<eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//Function"
		85	eOpposite="#//Function/subElements"/>
		86	</eClassifiers>
		87	<eClassifiers xsi:type="ecore:EClass" name="FunctionalArchitectureModel">
		88	<eStructuralFeatures xsi:type="ecore:EReference" name="rootElements" upperBound="-1"
		89	eType="#//FunctionalElement" containment="true"/>
		90	</eClassifiers>
		91	<eClassifiers xsi:type="ecore:EClass" name="Function" eSuperTypes="#//FunctionalElement">
		92	<eStructuralFeatures xsi:type="ecore:EReference" name="subElements" upperBound="-1"
		93	eType="#//FunctionalElement" containment="true" eOpposite="#//FunctionalElement/parent"/>
		94	<eStructuralFeatures xsi:type="ecore:EAttribute" name="type" lowerBound="1" eType="#//FunctionType"
		95	changeable="false" volatile="true" transient="true" derived="true"/>
		96	</eClassifiers>
		97	<eClassifiers xsi:type="ecore:EClass" name="FAMTerminator">
		98	<eStructuralFeatures xsi:type="ecore:EReference" name="data" eType="#//FunctionalData"
		99	eOpposite="#//FunctionalData/terminator"/>
		100	</eClassifiers>
		101	<eClassifiers xsi:type="ecore:EClass" name="InformationLink">
		102	<eStructuralFeatures xsi:type="ecore:EReference" name="from" eType="#//FunctionalOutput"
		103	eOpposite="#//FunctionalOutput/outgoingLinks"/>
		104	<eStructuralFeatures xsi:type="ecore:EReference" name="to" lowerBound="1" eType="#//FunctionalInput"
		105	eOpposite="#//FunctionalInput/IncomingLinks"/>
		106	</eClassifiers>
		107	<eClassifiers xsi:type="ecore:EClass" name="FunctionalInterface">
		108	<eStructuralFeatures xsi:type="ecore:EReference" name="data" upperBound="-1" eType="#//FunctionalData"
		109	containment="true" eOpposite="#//FunctionalData/interface"/>
		110	<eStructuralFeatures xsi:type="ecore:EReference" name="element" eType="#//FunctionalElement"
		111	eOpposite="#//FunctionalElement/interface"/>
		112	</eClassifiers>
		113	<eClassifiers xsi:type="ecore:EClass" name="FunctionalInput" eSuperTypes="#//FunctionalData">
		114	<eStructuralFeatures xsi:type="ecore:EReference" name="IncomingLinks" upperBound="-1"
		115	eType="#//InformationLink" eOpposite="#//InformationLink/to"/>
		116	</eClassifiers>
		117	<eClassifiers xsi:type="ecore:EClass" name="FunctionalOutput" eSuperTypes="#//FunctionalData">
		118	<eStructuralFeatures xsi:type="ecore:EReference" name="outgoingLinks" upperBound="-1"
		119	eType="#//InformationLink" containment="true" eOpposite="#//InformationLink/from"/>
		120	</eClassifiers>
		121	<eClassifiers xsi:type="ecore:EClass" name="FunctionalData" abstract="true">
		122	<eStructuralFeatures xsi:type="ecore:EReference" name="terminator" eType="#//FAMTerminator"
		123	containment="true" eOpposite="#//FAMTerminator/data"/>
		124	<eStructuralFeatures xsi:type="ecore:EReference" name="interface" eType="#//FunctionalInterface"
		125	eOpposite="#//FunctionalInterface/data"/>
		126	</eClassifiers>
		127	<eClassifiers xsi:type="ecore:EEnum" name="FunctionType">
		128	<eLiterals name="Root"/>
		129	<eLiterals name="Intermediate" value="1"/>
		130	<eLiterals name="Leaf" value="2"/>
		131	</eClassifiers>
		132	</ecore:EPackage>
		133	>>>>>>> 71108d46... VAMPIRE: Implement wf constraint handling