VAMPIRE: Implement wf constraint handling

3 files changed, 118 insertions, 39 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/plugin.xml b/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
index 213ec0ed..c7fcc081 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <?xml version="1.0" encoding="UTF-8"?><plugin>
   <extension id="extension.derived.hu.bme.mit.inf.dslreasoner.domains.transima.fam.model" point="org.eclipse.viatra.query.runtime.base.wellbehaving.derived.features">
     <wellbehaving-derived-feature classifier-name="FunctionalElement" feature-name="model" package-nsUri="http://www.inf.mit.bme.hu/viatrasolver/example/fam"/>
@@ -22,3 +23,16 @@
     </group>
   </extension>
 </plugin>
+=======
+<?xml version="1.0" encoding="UTF-8"?><plugin>
+  <extension point="org.eclipse.emf.ecore.generated_package">
+    <!-- @generated FamMetamodel -->
+    <package class="functionalarchitecture.FunctionalarchitecturePackage" genModel="model/FamMetamodel.genmodel" uri="http://www.inf.mit.bme.hu/viatrasolver/example/fam"/>
+  </extension>
+  <extension id="hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns" point="org.eclipse.viatra.query.runtime.queryspecification">
+    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns" id="hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns">
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.terminatorAndInformation"/>
+    </group>
+  </extension>
+</plugin>
+>>>>>>> 71108d46... VAMPIRE: Implement wf constraint handling
diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/src/hu/bme/mit/inf/dslreasoner/domains/transima/fam/FamPatterns.vql b/Domains/Examples/ModelGenExampleFAM_plugin/src/hu/bme/mit/inf/dslreasoner/domains/transima/fam/FamPatterns.vql
index f0e48d42..15f70963 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/src/hu/bme/mit/inf/dslreasoner/domains/transima/fam/FamPatterns.vql
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/src/hu/bme/mit/inf/dslreasoner/domains/transima/fam/FamPatterns.vql
@@ -11,45 +11,46 @@ pattern terminatorAndInformation(T : FAMTerminator, I : InformationLink) = {
         FunctionalInput.terminator(In,T);

 }

 

-@QueryBasedFeature 

-pattern type(This : Function, Target : FunctionType) = {

-        find rootElements(_Model, This);

-        Target == FunctionType::Root;

-} or {

-        neg find parent(_Child, This);

-        neg find rootElements(_Model, This);

-        Target == FunctionType::Leaf;

-} or  {

-        find parent(This, _Par);

-        find parent(_Child, This);

-        Target == FunctionType::Intermediate;

-}

-

-pattern rootElements(Model: FunctionalArchitectureModel, Root : Function) = {

-        FunctionalArchitectureModel.rootElements(Model, Root);

-}

-

-pattern parent(Func : Function, Par : Function) = {

-        Function.parent(Func, Par);

-}

-

-@QueryBasedFeature 

-pattern model(This:FunctionalElement, Target: FunctionalArchitectureModel) {

-        FunctionalElement(This);

-        FunctionalArchitectureModel(Target);

-}

-

-pattern hasRoot(F : Function) {

-        find rootElements(_Model, F);

-}

-pattern hasInt(F : Function) {

-        neg find parent(_Child, F);

-        neg find rootElements(_Model, F);

-}

-pattern hasLeaf(F : Function) {

-        find parent(F, _Par);

-        find parent(_Child, F);

-}

+//@QueryBasedFeature 

+//pattern type(This : Function, Target : FunctionType) = {

+//      find rootElements(_Model, This);

+//      Target == FunctionType::Root;

+//} or {

+//      neg find parent(_Child, This);

+//      neg find rootElements(_Model, This);

+//      Target == FunctionType::Leaf;

+//} or  {

+//      find parent(This, _Par);

+//      find parent(_Child, This);

+//      Target == FunctionType::Intermediate;

+//}

+//

+////@Constraint

+//pattern rootElements(Model: FunctionalArchitectureModel, Root : Function) = {

+//      FunctionalArchitectureModel.rootElements(Model, Root);

+//}

+//

+//pattern parent(Func : Function, Par : Function) = {

+//      Function.parent(Func, Par);

+//}

+//

+//@QueryBasedFeature 

+//pattern model(This:FunctionalElement, Target: FunctionalArchitectureModel) {

+//      FunctionalElement(This);

+//      FunctionalArchitectureModel(Target);

+//}

+//

+//pattern hasRoot(F : Function) {

+//      find rootElements(_Model, F);

+//}

+//pattern hasInt(F : Function) {

+//      neg find parent(_Child, F);

+//      neg find rootElements(_Model, F);

+//}

+//pattern hasLeaf(F : Function) {

+//      find parent(F, _Par);

+//      find parent(_Child, F);

+//}

 /*

 @Constraint(message="noRoot", severity="error", key={fam})

 pattern noRoot(fam: FunctionalArchitectureModel) {