VAMPIRE: fix model generation

3 files changed, 48 insertions, 31 deletions

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.ecore b/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.ecore
index 81b2078f..d8331ba8 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.ecore
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.ecore
@@ -9,7 +9,11 @@
     <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"/>

+        volatile="true" transient="true" derived="true">

+      <eAnnotations source="org.eclipse.viatra.query.querybasedfeature">

+        <details key="patternFQN" value="hu.bme.mit.inf.dslreasoner.domains.transima.fam.model"/>

+      </eAnnotations>

+    </eStructuralFeatures>

     <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//Function"

         eOpposite="#//Function/subElements"/>

   </eClassifiers>

@@ -21,7 +25,11 @@
     <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"/>

+        changeable="false" volatile="true" transient="true" derived="true">

+      <eAnnotations source="org.eclipse.viatra.query.querybasedfeature">

+        <details key="patternFQN" value="hu.bme.mit.inf.dslreasoner.domains.transima.fam.type"/>

+      </eAnnotations>

+    </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="FAMTerminator">

     <eStructuralFeatures xsi:type="ecore:EReference" name="data" eType="#//FunctionalData"

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml b/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
index b8de244d..d6f22c95 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
@@ -3,9 +3,19 @@
     <!-- @generated FamMetamodel -->

     <package class="functionalarchitecture.FunctionalarchitecturePackage" genModel="model/FamMetamodel.genmodel" uri="http://www.inf.mit.bme.hu/viatrasolver/example/fam"/>

   </extension>

+  <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"/>

+  </extension>

+  <extension id="extension.derived.hu.bme.mit.inf.dslreasoner.domains.transima.fam.type" point="org.eclipse.viatra.query.runtime.base.wellbehaving.derived.features">

+    <wellbehaving-derived-feature classifier-name="Function" feature-name="type" package-nsUri="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"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.type"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.rootElements"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.parent"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.model"/>

     </group>

   </extension>

 </plugin>

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 15f70963..24348eb0 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,35 +11,34 @@ 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;

-//}

-//

-////@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);

-//}

-//

+@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);

 //}